Skip to content

Commit aeda555

Browse files
authored
Upgrade macOS version in GitHub Actions (rust-lang#1404)
1 parent d13d5ff commit aeda555

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

.github/workflows/kani.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ${{ matrix.os }}
99
strategy:
1010
matrix:
11-
os: [macos-10.15, ubuntu-18.04, ubuntu-20.04]
11+
os: [macos-11, ubuntu-18.04, ubuntu-20.04]
1212
steps:
1313
- name: Checkout Kani
1414
uses: actions/checkout@v2
@@ -94,9 +94,9 @@ jobs:
9494
runs-on: ${{ matrix.os }}
9595
strategy:
9696
matrix:
97-
os: [macos-10.15, ubuntu-18.04]
97+
os: [macos-11, ubuntu-18.04]
9898
include:
99-
- os: macos-10.15
99+
- os: macos-11
100100
artifact: kani-latest-x86_64-apple-darwin.tar.gz
101101
- os: ubuntu-18.04
102102
artifact: kani-latest-x86_64-unknown-linux-gnu.tar.gz
@@ -136,7 +136,7 @@ jobs:
136136
# We can't run macos in a container, so we can only test locally.
137137
# Hopefully any dependency issues won't be unique to macos.
138138
- name: Local install test
139-
if: ${{ matrix.os == 'macos-10.15' }}
139+
if: ${{ matrix.os == 'macos-11' }}
140140
run: |
141141
cargo install --path ./target/package/kani-verifier-*[^e]
142142
cargo-kani setup --use-local-bundle ./${{ matrix.artifact }}

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ jobs:
5858
contents: write
5959
strategy:
6060
matrix:
61-
os: [macos-10.15, ubuntu-18.04]
61+
os: [macos-11, ubuntu-18.04]
6262
include:
63-
- os: macos-10.15
63+
- os: macos-11
6464
target: x86_64-apple-darwin
6565
- os: ubuntu-18.04
6666
target: x86_64-unknown-linux-gnu

docs/src/build-from-source.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ source $HOME/.cargo/env
3737

3838
### Install dependencies on macOS
3939

40-
Support is available for macOS 10.15+. You need to have [Homebrew](https://brew.sh/) installed already.
40+
Support is available for macOS 11. You need to have [Homebrew](https://brew.sh/) installed already.
4141

4242
```
4343
# git clone git@github.com:model-checking/kani.git
4444
git clone https://github.com/model-checking/kani.git
4545
cd kani
4646
git submodule update --init
47-
./scripts/setup/macos-10.15/install_deps.sh
48-
./scripts/setup/macos-10.15/install_cbmc.sh
47+
./scripts/setup/macos/install_deps.sh
48+
./scripts/setup/macos/install_cbmc.sh
4949
./scripts/setup/install_viewer.sh
5050
# If you haven't already:
5151
./scripts/setup/install_rustup.sh

scripts/setup/macos-10.15

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
macos

scripts/setup/macos-11

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
macos

scripts/setup/macos-10.15/install_cbmc.sh scripts/setup/macos/install_cbmc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if [ -z "${CBMC_VERSION:-}" ]; then
1212
exit 1
1313
fi
1414

15-
# Install CBMC for macOS 10.15 from CBMC tap
15+
# Install CBMC for macOS from CBMC tap
1616
# https://github.com/diffblue/cbmc/blob/develop/doc/ADR/homebrew_tap.md
1717
brew tap diffblue/cbmc
1818
brew install diffblue/cbmc/cbmc@${CBMC_VERSION}
File renamed without changes.

0 commit comments

Comments
 (0)