More CI bugfixes

MWATelescope · Oct 16, 2024 · 81b7f64 · 81b7f64
1 parent b8dfe7b
commit 81b7f64
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -35,18 +35,13 @@ jobs:
         platform:
           - runner: ubuntu-latest
             target: x86_64
-          - runner: ubuntu-latest
-            target: aarch64
-          - runner: ubuntu-latest
-            target: armv7
-          - runner: ubuntu-latest
-            target: ppc64le
-    steps:            
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v1
-        with:
-          platforms: all
-
+#          - runner: ubuntu-latest
+#            target: aarch64
+#          - runner: ubuntu-latest
+#            target: armv7
+#          - runner: ubuntu-latest
+#            target: ppc64le
+    steps:                  
       - name: Checkout repository
         uses: actions/checkout@v4
 
@@ -105,7 +100,7 @@ jobs:
       - name: Upload linux tarball
         uses: actions/upload-artifact@v4
         with:
-          name: linux-${{ matrix.target }}.tar.gz
+          name: linux-${{ matrix.platform.target }}.tar.gz
           path: "*.tar.gz"
           if-no-files-found: error
 
@@ -117,7 +112,7 @@ jobs:
           - runner: macos-12
             target: x86_64
           - runner: macos-14
-            target: aarch64
+            target: arm64
     steps:      
       - name: Checkout repository
         uses: actions/checkout@v4      
@@ -127,9 +122,7 @@ jobs:
           brew install automake autoconf
 
       - name: Build macos wheels
-        uses: PyO3/maturin-action@v1
-        env: 
-          MWALIB_LINK_STATIC_CFITSIO: 1
+        uses: PyO3/maturin-action@v1        
         with:
           target: ${{ matrix.platform.target }}
           args: --release --all-features --out dist -i 3.9 3.10 3.11 3.12
@@ -184,7 +177,7 @@ jobs:
       - name: Upload macos tarball
         uses: actions/upload-artifact@v4
         with:
-          name: macos-${{ matrix.target }}.tar.gz
+          name: macos-${{ matrix.platform.target }}.tar.gz
           path: "*.tar.gz"
           if-no-files-found: error
 

diff --git a/.github/workflows/run_python_tests.yml b/.github/workflows/run_python_tests.yml
@@ -43,17 +43,19 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-
-    - name: Run rust tests to generate test data
-      run: cargo test --features cfitsio-static, examples
-
+
     - name: Setup python environment and build mwalib Python module
       run: |
+          echo "Run rust tests to generate test data"
+          cargo test --features cfitsio-static, examples
+          
+          echo "Install Python deps"
           pip3 install --upgrade pip
           python3 -m venv env
           source env/bin/activate
           pip3 install --upgrade pip
           pip3 install maturin pytest
 
+          echo "Build mwalib python module and test"
           maturin develop --all-features --strip
           pytest