Merge pull request #176 from JohanMabille/gha_ci

Fixed GHA
xtensor-stack · Apr 2, 2024 · ce827df · ce827df
2 parents 0205f8b + 0b67239
commit ce827df
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 101 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/unix-build.yml b/.azure-pipelines/unix-build.yml
diff --git a/.github/workflows/linux.yml → .github/workflows/main.yml b/.github/workflows/linux.yml → .github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: Linux
+name: CI
 on:
   workflow_dispatch:
   pull_request:
@@ -11,10 +11,12 @@ defaults:
   run:
     shell: bash -e -l {0}
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  unix:
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
+      matrix:
+        os: [ubuntu-22.04, macos-12]
 
     steps:
 
@@ -31,9 +33,15 @@ jobs:
       run: cmake -G Ninja -Bbuild -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DDOWNLOAD_GTEST=ON -DHAVE_ALL_DEPS=ON
 
     - name: Generate data for zlib test
+      working-directory: build/test
       run: python -c 'import struct, zlib; open("files/test.zl", "wb").write(zlib.compress(struct.pack("4d", 3.0, 2.0, 1.0, 0.0), level=1))'
 
-    - name: Build and run xtensor-io tests
+    - name: Build
+      working-directory: build
+      run: cmake --build . --target test_xtensor_io_lib --parallel 8
+
+    - name: Run tests
+      working-directory: build/test
       run: |
         export GTEST_FILTER="-xio_gdal_handler.read_vsigs"
-        make -j2 xtest
+        ./test_xtensor_io_lib
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/environment-dev.yml b/environment-dev.yml
@@ -4,6 +4,7 @@ channels:
 dependencies:
   # Build dependencies
   - cmake
+  - ninja
   # Host dependencies
   - openimageio=2.2.7
   - libsndfile=1.0.30