Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch MacOS CI jobs to macos-13 #2987

Merged
merged 6 commits into from
Jan 31, 2024
Merged

Switch MacOS CI jobs to macos-13 #2987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a630004
Switch MacOS CI jobs to macos-13
tautschnig Jan 29, 2024
4e35f6d
Add setup symlink
tautschnig Jan 29, 2024
ab0a4d6
Try to install pre-bottled cbmc-viewer
tautschnig Jan 29, 2024
abfcd2e
Revert "Try to install pre-bottled cbmc-viewer"
tautschnig Jan 31, 2024
fdef569
Pre-install Python 3.12
tautschnig Jan 31, 2024
707526a
Actually ignore errors
tautschnig Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cbmc-latest.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
macos
3 changes: 3 additions & 0 deletions scripts/setup/macos/install_viewer.sh
View file
Open in desktop
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)"
Loading