Skip to content

Commit ce827df

Browse files
authored
Merge pull request #176 from JohanMabille/gha_ci
Fixed GHA
2 parents 0205f8b + 0b67239 commit ce827df

File tree

6 files changed

+14
-101
lines changed

6 files changed

+14
-101
lines changed

.azure-pipelines/azure-pipelines-linux.yml

-17
This file was deleted.

.azure-pipelines/azure-pipelines-osx.yml

-26
This file was deleted.

.azure-pipelines/unix-build.yml

-46
This file was deleted.

.github/workflows/linux.yml renamed to .github/workflows/main.yml

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Linux
1+
name: CI
22
on:
33
workflow_dispatch:
44
pull_request:
@@ -11,10 +11,12 @@ defaults:
1111
run:
1212
shell: bash -e -l {0}
1313
jobs:
14-
build:
15-
runs-on: ubuntu-latest
14+
unix:
15+
runs-on: ${{ matrix.os }}
1616
strategy:
1717
fail-fast: false
18+
matrix:
19+
os: [ubuntu-22.04, macos-12]
1820

1921
steps:
2022

@@ -31,9 +33,15 @@ jobs:
3133
run: cmake -G Ninja -Bbuild -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DDOWNLOAD_GTEST=ON -DHAVE_ALL_DEPS=ON
3234

3335
- name: Generate data for zlib test
36+
working-directory: build/test
3437
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))'
3538

36-
- name: Build and run xtensor-io tests
39+
- name: Build
40+
working-directory: build
41+
run: cmake --build . --target test_xtensor_io_lib --parallel 8
42+
43+
- name: Run tests
44+
working-directory: build/test
3745
run: |
3846
export GTEST_FILTER="-xio_gdal_handler.read_vsigs"
39-
make -j2 xtest
47+
./test_xtensor_io_lib

azure-pipelines.yml

-7
This file was deleted.

environment-dev.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ channels:
44
dependencies:
55
# Build dependencies
66
- cmake
7+
- ninja
78
# Host dependencies
89
- openimageio=2.2.7
910
- libsndfile=1.0.30

0 commit comments

Comments
 (0)