From 71c8aca649bc6ddd9e471ad93e741bf8a036c985 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Wed, 31 Jan 2024 23:13:23 +0100 Subject: [PATCH] Switch MacOS CI jobs to macos-13 (#2987) This is currently marked "Beta". Switching is an attempt to address the memory allocation failures. --- .github/workflows/cbmc-latest.yml | 2 +- .github/workflows/kani.yml | 2 +- .github/workflows/release.yml | 10 +++++----- .github/workflows/slow-tests.yml | 2 +- scripts/setup/macos-13 | 1 + scripts/setup/macos/install_viewer.sh | 3 +++ 6 files changed, 12 insertions(+), 8 deletions(-) create mode 120000 scripts/setup/macos-13 diff --git a/.github/workflows/cbmc-latest.yml b/.github/workflows/cbmc-latest.yml index e2a1f7a124f2..d8da02d21840 100644 --- a/.github/workflows/cbmc-latest.yml +++ b/.github/workflows/cbmc-latest.yml @@ -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 diff --git a/.github/workflows/kani.yml b/.github/workflows/kani.yml index e866eaf635de..abdc4ee46216 100644 --- a/.github/workflows/kani.yml +++ b/.github/workflows/kani.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e753320c158f..56cb99bac960 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ env: jobs: build_bundle_macos: name: BuildBundle-MacOs - runs-on: macos-12 + runs-on: macos-13 permissions: contents: write outputs: @@ -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: @@ -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: diff --git a/.github/workflows/slow-tests.yml b/.github/workflows/slow-tests.yml index b177b6d5f400..952f02a9f225 100644 --- a/.github/workflows/slow-tests.yml +++ b/.github/workflows/slow-tests.yml @@ -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 diff --git a/scripts/setup/macos-13 b/scripts/setup/macos-13 new file mode 120000 index 000000000000..a8d0f9c4854d --- /dev/null +++ b/scripts/setup/macos-13 @@ -0,0 +1 @@ +macos \ No newline at end of file diff --git a/scripts/setup/macos/install_viewer.sh b/scripts/setup/macos/install_viewer.sh index d58dbf58cb07..b55eca370d82 100755 --- a/scripts/setup/macos/install_viewer.sh +++ b/scripts/setup/macos/install_viewer.sh @@ -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)"