diff options
| author | mattip <matti.picus@gmail.com> | 2022-11-30 13:08:48 +0200 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2022-11-30 13:08:48 +0200 |
| commit | a031a84979d1deefa5cba78c1fdb564ed74cd674 (patch) | |
| tree | 52f2bb0af4f66cad46f759eed7452d490f91fb76 /tools | |
| parent | 3c2717c9a923926ca197bee88b4c5b646b1b93d3 (diff) | |
| download | numpy-a031a84979d1deefa5cba78c1fdb564ed74cd674.tar.gz | |
BUILD: fix cirrus wheel upload triggers
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ci/cirrus_general.yml | 7 | ||||
| -rw-r--r-- | tools/wheels/upload_wheels.sh | 9 |
2 files changed, 5 insertions, 11 deletions
diff --git a/tools/ci/cirrus_general.yml b/tools/ci/cirrus_general.yml index 5e9da9560..f48e1035c 100644 --- a/tools/ci/cirrus_general.yml +++ b/tools/ci/cirrus_general.yml @@ -69,13 +69,16 @@ wheels_upload_task: export IS_PUSH="false" # cron job - if [[ "$CIRRUS_CRON" == "nightly" ]]; then + if [[ "$CIRRUS_CRON" == "weekly" ]]; then export IS_SCHEDULE_DISPATCH="true" fi if [[ "$CIRRUS_TAG" == "v*" ]]; then export IS_PUSH="true" fi + if [[ "$CIRRUS_BUILD_SOURCE" == "api" && "$CIRRUS_COMMIT_MESSAGE" == "API build for null" ]]; then export IS_SCHEDULE_DISPATCH="true" + fi + # The name of the zip file is derived from the `wheels_artifact` line. # If you change the artifact line to `myfile_artifact` then it would be @@ -85,6 +88,6 @@ wheels_upload_task: unzip wheels.zip source ./tools/wheels/upload_wheels.sh - set_travis_vars + # set_travis_vars set_upload_vars upload_wheels # Will be skipped if not a push/tag/scheduled build diff --git a/tools/wheels/upload_wheels.sh b/tools/wheels/upload_wheels.sh index eef393875..8fd16a26b 100644 --- a/tools/wheels/upload_wheels.sh +++ b/tools/wheels/upload_wheels.sh @@ -1,23 +1,14 @@ set_travis_vars() { # Set env vars echo "TRAVIS_EVENT_TYPE is $TRAVIS_EVENT_TYPE" - echo CIRRUS_TASK_NAME is "$CIRRUS_TASK_NAME" echo "TRAVIS_TAG is $TRAVIS_TAG" - echo "CIRRUS_TAG is $CIRRUS_TAG" - echo "CIRRUS_API_CREATED is $CIRRUS_API_CREATED" - echo "CIRRUS_PR is $CIRRUS_PR" if [[ "$TRAVIS_EVENT_TYPE" == "push" && "$TRAVIS_TAG" == v* ]]; then IS_PUSH="true" - elif [[ "$CIRRUS_PR" == "" && "$CIRRUS_TAG" == v* ]]; then - IS_PUSH="true" else IS_PUSH="false" fi if [[ "$TRAVIS_EVENT_TYPE" == "cron" || -v CIRRUS_CRON ]]; then IS_SCHEDULE_DISPATCH="true" - elif [[ "$TRAVIS_EVENT_TYPE" == "api" || "$CIRRUS_API_CREATED" == "true" ]]; then - # Manual CI run, so upload - IS_SCHEDULE_DISPATCH="true" else IS_SCHEDULE_DISPATCH="false" fi |