summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattip <matti.picus@gmail.com>2022-11-28 15:53:37 +0200
committermattip <matti.picus@gmail.com>2022-11-28 17:13:59 +0200
commit407ff757c9b8c40f417962d113192244f4f222aa (patch)
treef7e5424b464eb17d97e5211033fe2a6c0b5ebe05
parentbba74740e5236735f6ec5013d8d778145b758e89 (diff)
downloadnumpy-407ff757c9b8c40f417962d113192244f4f222aa.tar.gz
BUILD: disable aarch64 on travis, parse CIRRUS env variables for wheel upload
-rw-r--r--.travis.yml42
-rw-r--r--tools/wheels/upload_wheels.sh8
2 files changed, 6 insertions, 44 deletions
diff --git a/.travis.yml b/.travis.yml
index dc967a9fd..e67099f84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,48 +50,6 @@ jobs:
- ATLAS=None
- EXPECT_CPU_FEATURES="VX VXE VXE2"
- # Wheel builders
- # Note that Ubuntu focal comes with Python 3.8 and CIBW_BUILD determines
- # the Python used to build the wheels.
- - python: "3.8"
- os: linux
- arch: arm64
- virt: vm
- env:
- - CIBW_BUILD: cp39-manylinux_aarch64
- install: python3 -m pip install cibuildwheel==2.11.2
- script: |
- cibuildwheel --output-dir wheelhouse
- source ./tools/wheels/upload_wheels.sh
- set_travis_vars
- set_upload_vars
- upload_wheels # Will be skipped if not a push/tag/scheduled build
- - python: "3.8"
- os: linux
- arch: arm64
- virt: vm
- env:
- - CIBW_BUILD: cp310-manylinux_aarch64
- install: python3 -m pip install cibuildwheel==2.11.2
- script: |
- cibuildwheel --output-dir wheelhouse
- source ./tools/wheels/upload_wheels.sh
- set_travis_vars
- set_upload_vars
- upload_wheels # Will be skipped if not a push/tag/scheduled build
- - python: "3.8"
- os: linux
- arch: arm64
- virt: vm
- env:
- - CIBW_BUILD: cp311-manylinux_aarch64
- install: python3 -m pip install cibuildwheel==2.11.2
- script: |
- cibuildwheel --output-dir wheelhouse
- source ./tools/wheels/upload_wheels.sh
- set_travis_vars
- set_upload_vars
- upload_wheels # Will be skipped if not a push/tag/scheduled build
before_install:
- ./tools/travis-before-install.sh
diff --git a/tools/wheels/upload_wheels.sh b/tools/wheels/upload_wheels.sh
index d65492ee7..4c650edaa 100644
--- a/tools/wheels/upload_wheels.sh
+++ b/tools/wheels/upload_wheels.sh
@@ -1,15 +1,19 @@
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"
if [[ "$TRAVIS_EVENT_TYPE" == "push" && "$TRAVIS_TAG" == v* ]]; then
IS_PUSH="true"
+ elif [[ "$CIRRUS_TASK_NAME" == "push" && "$CIRRUS_TAG" == v* ]]; then
+ IS_PUSH="true"
else
IS_PUSH="false"
fi
- if [[ "$TRAVIS_EVENT_TYPE" == "cron" ]]; then
+ if [[ "$TRAVIS_EVENT_TYPE" == "cron" || -v CIRRUS_CRON ]]; then
IS_SCHEDULE_DISPATCH="true"
- elif [[ "$TRAVIS_EVENT_TYPE" == "api" ]]; then
+ elif [[ "$TRAVIS_EVENT_TYPE" == "api" || "$CIRRUS_API_CREATED" == "true" ]]; then
# Manual CI run, so upload
IS_SCHEDULE_DISPATCH="true"
else