Skip to content

Commit

Permalink
MAINT: Run unit tests on new GitHub M1 runners (aramis-lab#1062)
Browse files Browse the repository at this point in the history
* try using M1 runner for unit tests

* split jobs and run ARM tests only on latest Python versions

* clean duplicated options and clean temp folders

* test only python 3.10 on ARM for now

* try removing parallel execution for fast non regression tests...

* try fix
  • Loading branch information
NicolasGensollen authored Jan 31, 2024
1 parent da641c4 commit 942b32b
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 9 deletions.
21 changes: 19 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ permissions:
contents: read

jobs:
test:
name: Run unit tests on ${{ matrix.os }} with Python ${{ matrix.python-version }}
test-intel:
name: Run unit tests on Intel ${{ matrix.os }} with Python ${{ matrix.python-version }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -27,3 +27,20 @@ jobs:
cache: poetry
- name: Run unit tests
run: make test

test-arm:
name: Run unit tests on ARM MacOS with Python ${{ matrix.python-version }}
runs-on: macos-14
strategy:
fail-fast: false
matrix:
python-version: ['3.10']
steps:
- uses: actions/checkout@v4
- uses: snok/install-poetry@v1
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: poetry
- name: Run unit tests
run: make test
12 changes: 6 additions & 6 deletions .github/workflows/test_non_regression_fast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ jobs:
--basetemp=/Volumes/data/tmp \
--junitxml=./test-reports/non_regression_fast_mac.xml \
--disable-warnings \
-n 4 \
--dist loadgroup \
-m "fast" \
--dist loadgroup \
./nonregression/
- name: Clean
run: |
rm -rf /Volumes/data/tmp
test-non-regression-fast-Linux:
runs-on:
Expand Down Expand Up @@ -78,8 +78,8 @@ jobs:
--basetemp=/mnt/data/ci/tmp \
--junitxml=./test-reports/non_regression_fast_linux.xml \
--disable-warnings \
-n 4 \
--dist loadgroup \
-m "fast" \
--dist loadgroup \
./nonregression/
- name: Clean
run: |
rm -rf /mnt/data/ci/tmp
2 changes: 1 addition & 1 deletion clinica/iotools/utils/data_handling.py
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ def compute_missing_mods(

out_dir = Path(out_dir)
bids_dir = Path(bids_dir)
os.makedirs(out_dir, exist_ok=True)
out_dir.mkdir(parents=True, exist_ok=True)

# Find all the modalities and sessions available for the input dataset
mods_and_sess = find_mods_and_sess(bids_dir)
Expand Down

0 comments on commit 942b32b

Please sign in to comment.