From 880094c3a7154b553ee9cb9b3b4beb9744f3458f Mon Sep 17 00:00:00 2001 From: Panos Date: Sun, 25 Oct 2020 11:09:06 +0000 Subject: [PATCH 1/4] updated circleci cfg --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c2b0ce2..425eee25 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,7 +105,7 @@ jobs: if [[ -z "${CIRCLE_PULL_REQUEST}" ]]; then echo "$DOCKER_PASSWORD" | docker login -u="$DOCKER_USERNAME" --password-stdin; fi - ./ci/travis/build-manylinux.sh + ./ci/build-manylinux.sh - run: name: Upload Wheels command: | From 6607eea5d9a1aedcb18089a7f1bd250ed53e398b Mon Sep 17 00:00:00 2001 From: Panos Date: Sun, 25 Oct 2020 11:10:06 +0000 Subject: [PATCH 2/4] test manylinux --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 425eee25..5eb01a60 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -127,11 +127,11 @@ workflows: ignore: /.*/ - manylinux: context: Docker - filters: - tags: - only: /.*/ - branches: - ignore: /.*/ + # filters: + # tags: + # only: /.*/ + # branches: + # ignore: /.*/ - osx: matrix: parameters: From 5ca0d8da52057e409ce8e11598b2154063bebdc7 Mon Sep 17 00:00:00 2001 From: Panos Date: Sun, 25 Oct 2020 11:12:10 +0000 Subject: [PATCH 3/4] Revert "test manylinux" This reverts commit 6607eea5d9a1aedcb18089a7f1bd250ed53e398b. --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5eb01a60..425eee25 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -127,11 +127,11 @@ workflows: ignore: /.*/ - manylinux: context: Docker - # filters: - # tags: - # only: /.*/ - # branches: - # ignore: /.*/ + filters: + tags: + only: /.*/ + branches: + ignore: /.*/ - osx: matrix: parameters: From bc517a95dec31202a6bdcf72bbd615eed71de0d3 Mon Sep 17 00:00:00 2001 From: Panos Date: Sun, 25 Oct 2020 11:28:14 +0000 Subject: [PATCH 4/4] updated circleci cfg --- .circleci/config.yml | 2 +- ci/build-manylinux.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 425eee25..c949c29c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,7 +102,7 @@ jobs: - run: name: Build Wheels command: | - if [[ -z "${CIRCLE_PULL_REQUEST}" ]]; then + if [[ -z "${CIRCLE_PR_NUMBER}" ]]; then echo "$DOCKER_PASSWORD" | docker login -u="$DOCKER_USERNAME" --password-stdin; fi ./ci/build-manylinux.sh diff --git a/ci/build-manylinux.sh b/ci/build-manylinux.sh index 38a6877f..ef2a36cf 100755 --- a/ci/build-manylinux.sh +++ b/ci/build-manylinux.sh @@ -7,6 +7,6 @@ python ci/appveyor/fix_version.py . docker pull $docker_tag || echo docker build --pull --cache-from $docker_tag ci/docker/manylinux -t $docker_tag -if [[ -z "$CIRCLE_PULL_REQUEST" ]]; then docker push $docker_tag; fi +if [[ -z "$CIRCLE_PR_NUMBER" ]]; then docker push $docker_tag; fi docker run --rm -v `pwd`:/io $docker_tag /io/ci/build-wheels.sh ls wheelhouse/