now that aarch64 is working, try again on travis

MacPython · Jul 30, 2024 · df90548 · df90548
1 parent cc2bc7c
commit df90548
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 19 deletions.
diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml
@@ -46,24 +46,24 @@ jobs:
             MB_ML_LIBC: musllinux
             MB_ML_VER: _1_1
 
-          - os: ubuntu-latest
-            PLAT: aarch64
-            INTERFACE64: '0'
-            MB_ML_VER: '2014'
-          - os: ubuntu-latest
-            PLAT: aarch64
-            INTERFACE64: '1'
-            MB_ML_VER: '2014'
-          - os: ubuntu-latest
-            PLAT: aarch64
-            INTERFACE64: '0'
-            MB_ML_LIBC: musllinux
-            MB_ML_VER: _1_1
-          - os: ubuntu-latest
-            PLAT: aarch64
-            INTERFACE64: '1'
-            MB_ML_LIBC: musllinux
-            MB_ML_VER: _1_1
+          # - os: ubuntu-latest
+          #   PLAT: aarch64
+          #   INTERFACE64: '0'
+          #   MB_ML_VER: '2014'
+          # - os: ubuntu-latest
+          #   PLAT: aarch64
+          #   INTERFACE64: '1'
+          #   MB_ML_VER: '2014'
+          # - os: ubuntu-latest
+          #   PLAT: aarch64
+          #   INTERFACE64: '0'
+          #   MB_ML_LIBC: musllinux
+          #   MB_ML_VER: _1_1
+          # - os: ubuntu-latest
+          #   PLAT: aarch64
+          #   INTERFACE64: '1'
+          #   MB_ML_LIBC: musllinux
+          #   MB_ML_VER: _1_1
 
         exclude:
           - PLAT: i686

diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,36 @@ services: docker
 
 matrix:
   include:
+    - os: linux
+      arch: arm64
+      env:
+        - PLAT=aarch64
+        - MB_ML_VER=_1_1
+        - INTERFACE64=0
+        - MB_ML_LIBC=musllinux
+        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
+    - os: linux
+      arch: arm64
+      env:
+        - PLAT=aarch64
+        - INTERFACE64=1
+        - MB_ML_VER=_1_1
+        - MB_ML_LIBC=musllinux
+        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
+    - os: linux
+      arch: arm64
+      env:
+        - PLAT=aarch64
+        - MB_ML_VER=2014
+        - INTERFACE64=0
+        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
+    - os: linux
+      arch: arm64
+      env:
+        - PLAT=aarch64
+        - INTERFACE64=1
+        - MB_ML_VER=2014
+        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
     - os: linux
       arch: s390x
       env:
@@ -55,7 +85,7 @@ install:
 
 script:
     # Build library and collect into libs subdirectory
-    - build_on_travis
+    - travis_wait 30 build_on_travis
     - libc=${MB_ML_LIBC:-manylinux}
     - docker_image=quay.io/pypa/${libc}${MB_ML_VER}_${PLAT}
     - docker run --rm -e INTERFACE64="${INTERFACE64}" -e MB_ML_LIBC="${MB_ML_LIBC}" -v $(pwd):/openblas "${docker_image}" /bin/bash -xe /openblas/tools/build_wheel.sh