Merge branch 'master' into 2024-12-19_themis_update

fossas · Dec 20, 2024 · 4bce837 · 4bce837
2 parents bc49763 + 76c06d8
commit 4bce837
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ 'LinuxARM', 'windows-latest', 'ubuntu-latest', 'macos-12', 'macos-latest']
+        os: [ 'LinuxARM', 'windows-latest', 'ubuntu-latest', 'macos-latest-large', 'macos-latest']
         include:
         - os: LinuxARM
           os-name: Linux-arm
@@ -35,8 +35,9 @@ jobs:
           # and in particular Windows doesn't support it
           rust-features: jemalloc
 
-        # macos-latest pointed at macos-12 this before it was changed to ARM.
-        - os: macos-12
+        # The 'large' runners are the only intel ones left:
+        # https://github.com/actions/runner-images?tab=readme-ov-file#available-images
+        - os: macos-latest-large
           os-name: macOS-intel
           project-file: cabal.project.ci.macos
           ghc: '9.8.2'

diff --git a/.github/workflows/install-script-test.yml b/.github/workflows/install-script-test.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-12]
+        os: [ubuntu-latest, macos-latest-large]
     steps:
       - uses: actions/checkout@v4