Skip to content

Commit

Permalink
Switch MacOS CI jobs to macos-13 (#2987)
Browse files Browse the repository at this point in the history
This is currently marked "Beta". Switching is an attempt to address the
memory allocation failures.
  • Loading branch information
tautschnig committed Jan 31, 2024
1 parent 89c61cf commit 71c8aca
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cbmc-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-12, ubuntu-20.04, ubuntu-22.04]
os: [macos-13, ubuntu-20.04, ubuntu-22.04]
steps:
- name: Checkout Kani under "kani"
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kani.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-12, ubuntu-20.04, ubuntu-22.04]
os: [macos-13, ubuntu-20.04, ubuntu-22.04]
steps:
- name: Checkout Kani
uses: actions/checkout@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:
jobs:
build_bundle_macos:
name: BuildBundle-MacOs
runs-on: macos-12
runs-on: macos-13
permissions:
contents: write
outputs:
Expand All @@ -35,13 +35,13 @@ jobs:
- name: Setup Kani Dependencies
uses: ./.github/actions/setup
with:
os: macos-12
os: macos-13

- name: Build bundle
id: bundle
uses: ./.github/actions/build-bundle
with:
os: macos-12
os: macos-13
arch: x86_64-apple-darwin

build_bundle_linux:
Expand Down Expand Up @@ -106,11 +106,11 @@ jobs:
needs: [build_bundle_macos, build_bundle_linux]
strategy:
matrix:
os: [macos-12, ubuntu-20.04, ubuntu-22.04]
os: [macos-13, ubuntu-20.04, ubuntu-22.04]
include:
# Stores the output of the previous job conditional to the OS
- prev_job: ${{ needs.build_bundle_linux.outputs }}
- os: macos-12
- os: macos-13
prev_job: ${{ needs.build_bundle_macos.outputs }}
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/slow-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-12, ubuntu-20.04, ubuntu-22.04]
os: [macos-13, ubuntu-20.04, ubuntu-22.04]
steps:
- name: Checkout Kani
uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions scripts/setup/macos-13
3 changes: 3 additions & 0 deletions scripts/setup/macos/install_viewer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,8 @@ set -x

# brew doesn't recognize specific versions of viewer
# Build from source, since there's only a macos-12 bottle which doesn't seem to work.
# Install Python 3.12 first while ignoring errors: the system may provide this
# version, which will hinder brew from installing symlinks
brew install python@3.12 || true
brew install -s aws/tap/cbmc-viewer
echo "Installed: $(cbmc-viewer --version)"

0 comments on commit 71c8aca

Please sign in to comment.