From fb8943a72ecc25882d901da5169de2796bb48163 Mon Sep 17 00:00:00 2001 From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> Date: Tue, 3 Dec 2024 18:49:48 +0000 Subject: [PATCH 1/2] Revert "Merge pull request #647 from cylc/actions" This reverts commit 6203e5d2f29fdd7e1dfd73a72c0d3aefa432b832, reversing changes made to 87ca49e258fb753127adb51e2bb1841d7d5dc61f. --- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c40f040..be24d1cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: os: ['ubuntu-latest'] python: ['3.8', '3.9'] include: - - os: 'macos-12' + - os: 'macos-latest' python: '3.8' steps: - name: Checkout diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ee898cff..d09123ae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: os: ['ubuntu-latest'] python: ['3.8', '3.9'] include: - - os: 'macos-12' + - os: 'macos-latest' python: '3.9' env: PYTEST_ADDOPTS: --cov --color=yes From d6d4ff20baa497ed0bfa903db6ca2cf11e88baa6 Mon Sep 17 00:00:00 2001 From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> Date: Tue, 3 Dec 2024 18:57:49 +0000 Subject: [PATCH 2/2] GH Actions: fix MacOS Python 3.9 installation problem --- .github/workflows/test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d09123ae..a1bbb9c1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,6 +34,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Patch DNS + uses: cylc/release-actions/patch-dns@v1 + + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python }} + - name: Brew Install if: startsWith(matrix.os, 'macos') run: | @@ -53,14 +61,6 @@ jobs: export PATH __HERE__ - - name: Patch DNS - uses: cylc/release-actions/patch-dns@v1 - - - name: Setup Python - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python }} - - name: install cylc-flow uses: cylc/release-actions/install-cylc-components@v1 with: