GH Actions: update MacOS version

MetRonnie · Jul 1, 2024 · bacf07f · bacf07f
1 parent 5fa10d2
commit bacf07f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/.github/workflows/test_fast.yml b/.github/workflows/test_fast.yml
@@ -23,8 +23,8 @@ jobs:
         python-version: ['3.7', '3.8', '3.10', '3.11', '3']
         include:
           # mac os test
-          - os: 'macos-11'
-            python-version: '3.7'  # oldest supported version
+          - os: 'macos-latest'
+            python-version: '3.9'  # oldest supported version
           # non-utc timezone test
           - os: 'ubuntu-latest'
             python-version: '3.9'  # not the oldest, not the most recent version

diff --git a/.github/workflows/test_functional.yml b/.github/workflows/test_functional.yml
@@ -74,14 +74,14 @@ jobs:
             platform: '_remote_background_indep_tcp _remote_at_indep_tcp'
           # macos
           - name: 'macos 1/5'
-            os: 'macos-11'
-            python-version: '3.7'
+            os: 'macos-latest'
+            python-version: '3.9'
             test-base: 'tests/f'
             chunk: '1/5'
             platform: '_local_background*'
           - name: 'macos 2/5'
-            os: 'macos-11'
-            python-version: '3.7'
+            os: 'macos-latest'
+            python-version: '3.9'
             test-base: 'tests/f'
             chunk: '2/5'
             platform: '_local_background*'
@@ -135,19 +135,15 @@ jobs:
 
           # add GNU coreutils and sed to the user PATH
           # (see instructions in brew install output)
-          echo \
-            "$(brew --prefix)/opt/coreutils/libexec/gnubin" \
-            >> "${GITHUB_PATH}"
-          echo \
-            "/usr/local/opt/gnu-sed/libexec/gnubin" \
-            >> "${GITHUB_PATH}"
-          echo \
-            "/usr/local/opt/grep/libexec/gnubin" \
-            >> "${GITHUB_PATH}"
+          echo "$(brew --prefix)/opt/coreutils/libexec/gnubin" >> "${GITHUB_PATH}"
+          echo "$(brew --prefix)/opt/grep/libexec/gnubin" >> "${GITHUB_PATH}"
+          echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> "${GITHUB_PATH}"
 
           # add coreutils to the bashrc too (for jobs)
           cat >> "${HOME}/.bashrc" <<__HERE__
-          PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
+          PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:$PATH"
+          PATH="$(brew --prefix)/opt/grep/libexec/gnubin:$PATH"
+          PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH"
           export PATH
           __HERE__