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

Bump GHA macos runner versions #2509

Merged
merged 1 commit into from
Jun 17, 2024
Merged

Bump GHA macos runner versions #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/canister-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ jobs:
# (in particular the slow macos builds). A single ubuntu build is not long and gives us some signal.
# XXX: GHA does not support proper if/else so we implement a workaround: https://github.com/actions/runner/issues/409
# XXX: GHA fails if we return the matrix object directly, so we have to pretend it's JSON
os: ${{ github.ref == 'refs/heads/main' && fromJson('[ "ubuntu-22.04", "ubuntu-20.04", "macos-11", "macos-12" ]') || fromJson('[ "ubuntu-22.04" ]') }}
os: ${{ github.ref == 'refs/heads/main' && fromJson('[ "ubuntu-22.04", "ubuntu-20.04", "macos-13", "macos-14" ]') || fromJson('[ "ubuntu-22.04" ]') }}
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/check-build
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/release-build-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
needs: latest-release
strategy:
matrix:
os: [ ubuntu-22.04, ubuntu-20.04, macos-11, macos-12 ]
os: [ ubuntu-22.04, ubuntu-20.04, macos-13, macos-14 ]
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -84,7 +84,9 @@ jobs:
needs: latest-release
strategy:
matrix:
os: [ ubuntu-22.04, ubuntu-20.04, macos-11, macos-12 ]
# macos-14 is itself virtualized and does not support nested virtualization which would be required for the docker build.
# -> just use macos-13
os: [ ubuntu-22.04, ubuntu-20.04, macos-13 ]
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -93,11 +95,7 @@ jobs:
- name: Setup docker (missing on MacOS)
if: runner.os == 'macos'
run: |
brew install docker
brew install docker-buildx
# The following 2 commands are taken from the post install instructions printed by `brew install docker-buildx`
mkdir -p ~/.docker/cli-plugins
ln -sfn /usr/local/opt/docker-buildx/bin/docker-buildx ~/.docker/cli-plugins/docker-buildx
brew install docker docker-buildx colima
colima start

- name: "Verify Hash"
Expand Down
Loading