From 006d7605869a27bc254a36b500fede3c86ee5c74 Mon Sep 17 00:00:00 2001 From: pgleeson <p.gleeson@gmail.com> Date: Thu, 11 Apr 2024 16:08:15 +0100 Subject: [PATCH 1/4] Test on macos14 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/examples.yml | 4 ++-- .github/workflows/python-publish.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bfdf23..ca8996a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,13 +14,13 @@ jobs: fail-fast: false matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] - runs-on: [ubuntu-latest, windows-latest, macos-latest] + runs-on: [ubuntu-latest, windows-latest, macos-latest, macos-14] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 8c21bb6..f97c3e4 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: nelonoel/branch-name@v1.0.1 # https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions @@ -21,7 +21,7 @@ jobs: id: extract_branch - name: Checkout jlems - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: LEMS/jLEMS ref: ${{ steps.extract_branch.outputs.branch }} diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 7d29880..734546a 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -18,9 +18,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.x' - name: Install dependencies From 1206cff34f0280ee892532261045ba445b7f4b86 Mon Sep 17 00:00:00 2001 From: pgleeson <p.gleeson@gmail.com> Date: Thu, 11 Apr 2024 16:23:41 +0100 Subject: [PATCH 2/4] Exclude 3.9 on mac14 --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca8996a..a1c0fa3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,9 @@ jobs: matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] runs-on: [ubuntu-latest, windows-latest, macos-latest, macos-14] + exclude: + - os: macos-14 + python-version: "3.9" steps: - uses: actions/checkout@v4 From ff3a73a7e27ec8f71c32c2e080f6f1403f8981cf Mon Sep 17 00:00:00 2001 From: Padraig Gleeson <p.gleeson@gmail.com> Date: Thu, 11 Apr 2024 16:24:22 +0100 Subject: [PATCH 3/4] Update ci.yml --- .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 a1c0fa3..8ea3cee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: python-version: ["3.9", "3.10", "3.11", "3.12"] runs-on: [ubuntu-latest, windows-latest, macos-latest, macos-14] exclude: - - os: macos-14 + - runs-on: macos-14 python-version: "3.9" steps: From e23ddbe97b06236946cfb0737b2f4e0ea9b6a263 Mon Sep 17 00:00:00 2001 From: pgleeson <p.gleeson@gmail.com> Date: Thu, 11 Apr 2024 16:31:01 +0100 Subject: [PATCH 4/4] Final gha version update --- .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 a1c0fa3..5b01381 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: python -m pip install pytest pytest-cov - name: Checkout NeuroML2 - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: NeuroML/NeuroML2 ref: development