From d27ecf68f701d6f9c5907737742aa5be7a7cd346 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 29 May 2024 12:15:47 -0400 Subject: [PATCH 1/2] Run `tests.yaml` on macOS --- .github/workflows/tests.yaml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index fe4bbdf3..aa48a90b 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -8,11 +8,16 @@ on: jobs: tests: - runs-on: ubuntu-20.04 + runs-on: ${{ matrix.os }} strategy: fail-fast: false + matrix: + os: + - ubuntu-20.04 + - macos-latest steps: - - name: Set up system + - name: Set up system (Ubuntu) + if: startsWith(matrix.os, 'ubuntu') shell: bash run: | bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh) @@ -20,10 +25,18 @@ jobs: sudo apt-get install eatmydata sudo eatmydata apt-get install singularity-container gnupg moreutils strace sudo eatmydata apt-get install datalad datalad-container + + - name: Set up system (macOS) + if: startsWith(matrix.os, 'macos') + run: | + python3 -m pip install datalad-container datalad-installer + datalad-installer -l DEBUG --sudo ok git-annex -m brew + + - name: Configure Git + run: | git config --global user.email "test@example.com" git config --global user.name "CI Almighty" - - name: Checkout this repository uses: actions/checkout@v4 From 2a4ec086bc47d9f7c0e469996a2ed78428cd4cf0 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 29 May 2024 12:19:36 -0400 Subject: [PATCH 2/2] Install Python packages in a venv --- .github/workflows/tests.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index aa48a90b..f6d2b5f2 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -29,7 +29,9 @@ jobs: - name: Set up system (macOS) if: startsWith(matrix.os, 'macos') run: | - python3 -m pip install datalad-container datalad-installer + python3 -m venv ~/venv + . ~/venv/bin/activate + pip install datalad-container datalad-installer datalad-installer -l DEBUG --sudo ok git-annex -m brew - name: Configure Git @@ -41,4 +43,8 @@ jobs: uses: actions/checkout@v4 - name: Test example in the README.md - run: bash <(sed -n -e '/^ *#!/,/^```$/p' README.md | grep -v '```') + run: | + if [ -d ~/venv ] + then . ~/venv/bin/activate + fi + bash <(sed -n -e '/^ *#!/,/^```$/p' README.md | grep -v '```')