Skip to content

Commit f9dbe28

Browse files
committed
CI: Use macOS 12
GitHub is deprecating (and eventually removing) its macOS 10.15 runners. See actions/runner-images#5583. Let's upgrade to a newer version in the CI. This proves relatively straightforward—the only other change required is to upgrade to a newer version of `what4-solvers`.
1 parent 8aa2294 commit f9dbe28

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

.github/workflows/ci.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Overall configuration notes:
22
# - Artifact uploads for binaries are from GHC 8.10.7
33
# - Builds for Ubuntu happen on 18.04 (would like to include 20.04, in addition)
4-
# - Builds for macOS builds on 10.15 (to avoid GHC bug on macOS 11; solvable with GHC > 8.10.4)
54
# - Docker builds happen nightly, on manual invocation, and on release branch commits
65
# Please update this comment as those details change.
76

@@ -24,7 +23,7 @@ env:
2423
# ./saw-remote-api/Dockerfile
2524
# ./s2nTests/scripts/blst-entrypoint.sh
2625
# ./s2nTests/docker/saw.dockerfile
27-
SOLVER_PKG_VERSION: "snapshot-20210917"
26+
SOLVER_PKG_VERSION: "snapshot-20220721"
2827

2928
OCAML_VERSION: 4.09.x
3029

@@ -67,7 +66,7 @@ jobs:
6766
strategy:
6867
fail-fast: false
6968
matrix:
70-
os: [ubuntu-18.04, macos-10.15, windows-latest]
69+
os: [ubuntu-18.04, macos-12, windows-latest]
7170
ghc: ["8.8.4", "8.10.7", "9.0.2"]
7271
exclude:
7372
- os: windows-latest
@@ -203,7 +202,7 @@ jobs:
203202
strategy:
204203
fail-fast: false
205204
matrix:
206-
os: [ubuntu-latest, macos-10.15]
205+
os: [ubuntu-latest, macos-12]
207206
runs-on: ${{ matrix.os }}
208207
steps:
209208
- uses: actions/checkout@v2
@@ -237,7 +236,7 @@ jobs:
237236
strategy:
238237
fail-fast: false
239238
matrix:
240-
os: [ubuntu-latest, macos-10.15]
239+
os: [ubuntu-latest, macos-12]
241240
runs-on: ${{ matrix.os }}
242241
steps:
243242
- uses: actions/checkout@v2
@@ -290,7 +289,7 @@ jobs:
290289
- test: saw-remote-api/scripts/run_rpc_tests.sh
291290
os: ubuntu-18.04
292291
- test: saw-remote-api/scripts/run_rpc_tests.sh
293-
os: macos-10.15
292+
os: macos-12
294293
- test: saw-remote-api/scripts/check_docs.sh
295294
os: ubuntu-18.04
296295
steps:
@@ -340,15 +339,15 @@ jobs:
340339
continue-on-error: [false]
341340
include:
342341
- suite: integration_tests
343-
os: macos-10.15
342+
os: macos-12
344343
continue-on-error: true # https://github.com/GaloisInc/saw-script/issues/1135
345344
- suite: integration_tests
346345
os: windows-latest
347346
timeout-minutes: 60
348347
continue-on-error: true # https://github.com/GaloisInc/saw-script/issues/1135
349348
exclude:
350349
- suite: integration_tests
351-
os: macos-10.15
350+
os: macos-12
352351
continue-on-error: false
353352
- suite: integration_tests
354353
os: windows-latest

0 commit comments

Comments
 (0)