From 3ba75d605d9fef7ec1c0640a11befeb6ea58de24 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Wed, 12 Nov 2025 18:55:06 +0000 Subject: [PATCH 1/4] Add worm2d... --- osb/checkOsb.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/osb/checkOsb.sh b/osb/checkOsb.sh index f54577ce..6b3b97fa 100755 --- a/osb/checkOsb.sh +++ b/osb/checkOsb.sh @@ -202,6 +202,7 @@ standardGHProject 'muscle_model' 'invertebrate/celegans' 'openworm' standardGHProject 'JohnsonMailler_MuscleModel' 'invertebrate/celegans' 'openworm' standardGHProject 'NicolettiEtAl2019_NeuronModels' 'invertebrate/celegans' 'openworm' standardGHProject 'NicolettiEtAl2024_MN_IN' 'invertebrate/celegans' 'openworm' +standardGHProject 'Worm2D' 'invertebrate/celegans' 'openworm' standardGHProject 'PyloricNetwork' 'invertebrate/lobster' standardGHProject 'MorrisLecarModel' 'invertebrate/barnacle' From 3d5c71cf63d02ebf9ffed62d2d1b4aafa151607b Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 13 Nov 2025 08:48:25 +0000 Subject: [PATCH 2/4] Update CI workflow to use new Windows runner --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 769d17ff..45f1a119 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: java: [ '8', '11', '16', '17', '19', '21' ] - runs-on: [ubuntu-latest, windows-latest, macos-latest, macos-13 ] + runs-on: [ubuntu-latest, windows-2022, macos-latest ] exclude: - runs-on: macos-latest java: "8" From a5fa242d69db3edca84599fd16a3111830318a65 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Fri, 14 Nov 2025 16:40:13 +0000 Subject: [PATCH 3/4] Add Windows SVN installation step in CI workflow --- .github/workflows/ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45f1a119..481407c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,6 +51,16 @@ jobs: echo Set up additional folders... ls + + - name: Test subversion on windows + if: ${{ contains(matrix.runs-on, 'windows') }} + shell: pwsh + run: | + choco install svn + echo "C:\Program Files (x86)\Subversion\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + refreshenv + svn --version + - name: Build project and run tests (non Win) if: ${{ matrix.runs-on != 'windows-latest' }} run: | From bd38e4381cfa96208af305431a7415ca3a2a7ea2 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Fri, 14 Nov 2025 16:48:08 +0000 Subject: [PATCH 4/4] Refactor CI conditions for Windows and non-Windows --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 481407c1..458ce3c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: svn --version - name: Build project and run tests (non Win) - if: ${{ matrix.runs-on != 'windows-latest' }} + if: ${{ !contains(matrix.runs-on, 'windows') }} run: | ./updatenC.sh # Pull other repos, e.g. NeuroML v1 examples from SourceForge # make @@ -73,7 +73,7 @@ jobs: ./nC.sh -v - name: Build project and run tests (Win) - if: ${{ matrix.runs-on == 'windows-latest' }} + if: ${{ contains(matrix.runs-on, 'windows') }} run: | ./updatenC.bat # Pull other repos, e.g. NeuroML v1 examples from SourceForge echo "Everything pulled..."