Skip to content

[ci] update to macos-26 - #11417

Merged
sunshowers merged 1 commit into
mainfrom
jj-stack/ci-update-to-macos-26-zxsmrrpz
Oct 7, 2026
Merged

sunshowers merged 1 commit into
mainfrom
jj-stack/ci-update-to-macos-26-zxsmrrpz

Conversation

@sunshowers

Copy link
Copy Markdown
Contributor

macos-14 is going away: https://github.blog/changelog/2026-10-01-github-actions-macos-14-runner-image-retirement/ saw a brownout today.

We could change this to "macos-latest" but I guess we prefer pinned OS versions here.

macos-14 is going away: https://github.blog/changelog/2026-10-01-github-actions-macos-14-runner-image-retirement/ saw a brownout today.

We could change this to "macos-latest" but I guess we prefer pinned OS versions here.
Comment on lines 32 to +34
fail-fast: false
matrix:
os: [ ubuntu-22.04, macos-14 ]
os: [ ubuntu-22.04, macos-26 ]

@sunshowers sunshowers Oct 5, 2026 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it worth also putting this on the r23 branch? The macos CI job doesn't block lands (though maybe it should? if we do decide to do that, I would avoid putting the exact macos version in the job title since that'll cause hassles in the future when this is bumped again.)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(iliana said "no" in #oxide-control-plane)

@iliana

iliana commented Oct 6, 2026

Copy link
Copy Markdown
Collaborator

I wish GHA had per-line timestamps like Buildomat does because boy howdy install_builder_prerequisites.sh should not be taking 41 minutes. (I don't think this is a new problem brought on by upgrading macOS.)

@sunshowers

Copy link
Copy Markdown
Contributor Author

https://github.com/oxidecomputer/omicron/actions/runs/37381953467/job/112005888042#step:9:1700 Looks like it maybe got stuck downloading Maghemite binaries? Could be a network blip but probably worth retrying a few times, hmm.

@sunshowers

sunshowers commented Oct 6, 2026 •

Copy link
Copy Markdown
Contributor Author

oxidecomputer/omicron/actions/runs/37381953467/job/112005888042#step:9:1700 Looks like it maybe got stuck downloading Maghemite binaries? Could be a network blip but probably worth retrying a few times, hmm.

Okay apparently when running cargo xtask download all we build maghemite (and dendrite) from source on macOS. Should we publish macOS binaries for them? We already publish Linux binaries for them.

In any case this PR doesn't impact that in any way.

@david-crespo

Copy link
Copy Markdown
Contributor

A long time ago we were blocked by dendrite being private (oxidecomputer/maghemite#198), then it became public and I never followed up.

sunshowers added a commit to oxidecomputer/maghemite that referenced this pull request Oct 6, 2026
Noticed while doing oxidecomputer/omicron#11417 that Omicron was building mgd and ddmd from scratch on macOS. Cache aarch64 binaries (presumably nobody is using x86_64 binaries?) by building them in GitHub Actions and having a Buildomat job pull from there.

The `fetch-gh-artifacts.sh` script is copied verbatim from https://github.com/oxidecomputer/cockroach/blob/c6c314d6cfff4b51e1df3355cb72172e45150ceb/.github/buildomat/fetch-gh-artifacts.sh. The script is known to work well. Note that the script doesn't pass `shellcheck -o all` so we don't add it to the set of scripts to lint in the shellcheck job.
sunshowers added a commit to oxidecomputer/maghemite that referenced this pull request Oct 6, 2026
Noticed while doing oxidecomputer/omicron#11417 that Omicron was building mgd and ddmd from scratch on macOS. Cache aarch64 binaries (presumably nobody is using x86_64 binaries?) by building them in GitHub Actions and having a Buildomat job pull from there.

The `fetch-gh-artifacts.sh` script is copied verbatim from https://github.com/oxidecomputer/cockroach/blob/c6c314d6cfff4b51e1df3355cb72172e45150ceb/.github/buildomat/fetch-gh-artifacts.sh. The script is known to work well. Note that the script doesn't pass `shellcheck -o all` so we don't add it to the set of scripts to lint in the shellcheck job.
sunshowers added a commit to oxidecomputer/maghemite that referenced this pull request Oct 6, 2026
Noticed while doing oxidecomputer/omicron#11417 that Omicron was building mgd and ddmd from scratch on macOS. Cache aarch64 binaries (presumably nobody is using x86_64 binaries?) by building them in GitHub Actions and having a Buildomat job pull from there.

The `fetch-gh-artifacts.sh` script is copied verbatim from https://github.com/oxidecomputer/cockroach/blob/c6c314d6cfff4b51e1df3355cb72172e45150ceb/.github/buildomat/fetch-gh-artifacts.sh. The script is known to work well. Note that the script doesn't pass `shellcheck -o all` so we don't add it to the set of scripts to lint in the shellcheck job.

@iliana iliana left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need to hold this PR for maghemite/dendrite binaries since that isn't a regression, but you can if you want.

@sunshowers

Copy link
Copy Markdown
Contributor Author

@iliana yep, going to do that in a followup.

@sunshowers
sunshowers merged commit 52ac94a into main Oct 7, 2026
25 checks passed
@sunshowers
sunshowers deleted the jj-stack/ci-update-to-macos-26-zxsmrrpz branch October 7, 2026 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants