Skip to content

Commit 05c98b3

Browse files
authored
Update our CI to run on MacOS 12 instead of 11 (rust-lang#2828)
Update the CI to use MacOS 12 instead of MacOS 11. I'm leaving this as a draft until I can validate that the bundle works on MacOS 11. Resolves rust-lang#2827
1 parent c336ddf commit 05c98b3

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

.github/workflows/cbmc-latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ${{ matrix.os }}
2020
strategy:
2121
matrix:
22-
os: [macos-11, ubuntu-20.04, ubuntu-22.04]
22+
os: [macos-12, ubuntu-20.04, ubuntu-22.04]
2323
steps:
2424
- name: Checkout Kani under "kani"
2525
uses: actions/checkout@v3

.github/workflows/kani.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
matrix:
20-
os: [macos-11, ubuntu-20.04, ubuntu-22.04]
20+
os: [macos-12, ubuntu-20.04, ubuntu-22.04]
2121
steps:
2222
- name: Checkout Kani
2323
uses: actions/checkout@v3
@@ -149,9 +149,9 @@ jobs:
149149
runs-on: ${{ matrix.os }}
150150
strategy:
151151
matrix:
152-
os: [macos-11]
152+
os: [macos-12]
153153
include:
154-
- os: macos-11
154+
- os: macos-12
155155
artifact: kani-latest-x86_64-apple-darwin.tar.gz
156156
steps:
157157
- name: Checkout Kani
@@ -170,7 +170,7 @@ jobs:
170170
# We can't run macos in a container, so we can only test locally.
171171
# Hopefully any dependency issues won't be unique to macos.
172172
- name: Local install test
173-
if: ${{ matrix.os == 'macos-11' }}
173+
if: ${{ matrix.os == 'macos-12' }}
174174
run: |
175175
cargo install --path ./target/package/kani-verifier-*[^e]
176176
cargo-kani setup --use-local-bundle ./${{ matrix.artifact }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
MacOs-Bundle:
5353
name: MacOs-Bundle
5454
needs: Release
55-
runs-on: macos-11
55+
runs-on: macos-12
5656
permissions:
5757
contents: write
5858
steps:
@@ -62,7 +62,7 @@ jobs:
6262
- name: Setup Kani Dependencies
6363
uses: ./.github/actions/setup
6464
with:
65-
os: macos-11
65+
os: macos-12
6666

6767
- name: Build release bundle
6868
run: |

.github/workflows/slow-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [macos-11, ubuntu-20.04, ubuntu-22.04]
21+
os: [macos-12, ubuntu-20.04, ubuntu-22.04]
2222
steps:
2323
- name: Checkout Kani
2424
uses: actions/checkout@v3

scripts/setup/macos-12

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
macos

scripts/setup/macos/install_viewer.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ fi
1717
set -x
1818

1919
# brew doesn't recognize specific versions of viewer
20-
brew install aws/tap/cbmc-viewer
20+
# Build from source, since there's only a macos-12 bottle which doesn't seem to work.
21+
brew install -s aws/tap/cbmc-viewer
22+
echo "Installed: $(cbmc-viewer --version)"

0 commit comments

Comments
 (0)