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.

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

Use GitHub-hosted macos-12 in CI, not deprecated macos-11 #21003

Merged
merged 1 commit into from
Jun 5, 2024

Conversation

huonw
Copy link
Contributor

@huonw huonw commented Jun 4, 2024

GitHub Actions has deprecated their macos-11 hosted runners, and removing them at the end of the month. This thus bumps to macos-12, the oldest supported version.

https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/

This cherry-picks to all active branches to ensure their CI continues to work.

Fixes #20938

@huonw huonw added needs-cherrypick category:internal CI, fixes for not-yet-released features, etc. labels Jun 4, 2024
@huonw huonw added this to the 2.20.x milestone Jun 4, 2024
@huonw huonw requested review from benjyw and thejcannon June 4, 2024 22:16
@benjyw
Copy link
Contributor

benjyw commented Jun 5, 2024

We were running the MacOS 11 x86_64 CI shards on a self-hosted runner (IIRC, because the GH hosted ones were horrifically unreliable).

But looks like these ran on hosted runners?

@huonw
Copy link
Contributor Author

huonw commented Jun 5, 2024

It looks like for macOS x86-64:

  • 11: github-hosted (changed here)
  • 10.15: self-hosted (not changed)

(Not directly related to this PR, but I've assumed that we have the 10.15 self-hosted runner around to be able to do releases that are still compatible with that older version.)

@benjyw
Copy link
Contributor

benjyw commented Jun 5, 2024

Hmm, yes, looks like there were/are 3 macos platforms in play.

@huonw
Copy link
Contributor Author

huonw commented Jun 5, 2024

Four if we go with #20997! 😅

@huonw huonw merged commit 5fe4525 into main Jun 5, 2024
25 checks passed
@huonw huonw deleted the huonw/20938-macos-12 branch June 5, 2024 04:46
@WorkerPants
Copy link
Member

I tried to automatically cherry-pick this change back to each relevant milestone, so that it is available in those older releases of Pants.

❌ 2.20.x

I was unable to cherry-pick this PR to 2.20.x, likely due to merge-conflicts.

Steps to Cherry-Pick locally

To resolve:

  1. (Ensure your git working directory is clean)
  2. Run the following script to reproduce the merge-conflicts:
    git fetch https://github.com/pantsbuild/pants main \
      && git fetch https://github.com/pantsbuild/pants 2.20.x \
      && git checkout -b cherry-pick-21003-to-2.20.x FETCH_HEAD \
      && git cherry-pick 5fe452588a9a5b12b566fa3428ef7fc26f7660ba
  3. Fix the merge conflicts and commit the changes
  4. Run build-support/cherry_pick/make_pr.sh "21003" "2.20.x"

Please note that I cannot re-run CI if a job fails. Please work with your PR approver(s) to re-run CI if necessary.

❌ 2.21.x

I was unable to cherry-pick this PR to 2.21.x, likely due to merge-conflicts.

Steps to Cherry-Pick locally

To resolve:

  1. (Ensure your git working directory is clean)
  2. Run the following script to reproduce the merge-conflicts:
    git fetch https://github.com/pantsbuild/pants main \
      && git fetch https://github.com/pantsbuild/pants 2.21.x \
      && git checkout -b cherry-pick-21003-to-2.21.x FETCH_HEAD \
      && git cherry-pick 5fe452588a9a5b12b566fa3428ef7fc26f7660ba
  3. Fix the merge conflicts and commit the changes
  4. Run build-support/cherry_pick/make_pr.sh "21003" "2.21.x"

Please note that I cannot re-run CI if a job fails. Please work with your PR approver(s) to re-run CI if necessary.


When you're done manually cherry-picking, please remove the needs-cherrypick label on this PR.

Thanks again for your contributions!

🤖 Beep Boop here's my run link

@WorkerPants WorkerPants added the auto-cherry-picking-failed Auto Cherry-Picking Failed label Jun 5, 2024
huonw added a commit that referenced this pull request Jun 5, 2024
GitHub Actions has deprecated their `macos-11` hosted runners, and
removing them at the end of the month. This thus bumps to `macos-12`,
the oldest supported version.

https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/

This cherry-picks to all active branches to ensure their CI continues to
work.

Fixes #20938
huonw added a commit that referenced this pull request Jun 5, 2024
GitHub Actions has deprecated their `macos-11` hosted runners, and
removing them at the end of the month. This thus bumps to `macos-12`,
the oldest supported version.

https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/

This cherry-picks to all active branches to ensure their CI continues to
work.

Fixes #20938
huonw added a commit that referenced this pull request Jun 10, 2024
…k of #21003) (#21008)

GitHub Actions has deprecated their `macos-11` hosted runners, and
removing them at the end of the month. This thus bumps to `macos-12`,
the oldest supported version.


https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/

This cherry-picks to all active branches to ensure their CI continues to
work.

Fixes #20938
huonw added a commit that referenced this pull request Jun 10, 2024
…k of #21003) (#21009)

GitHub Actions has deprecated their `macos-11` hosted runners, and
removing them at the end of the month. This thus bumps to `macos-12`,
the oldest supported version.


https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/

This cherry-picks to all active branches to ensure their CI continues to
work.

Fixes #20938
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-cherry-picking-failed Auto Cherry-Picking Failed category:internal CI, fixes for not-yet-released features, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GitHub-hosted macos-11 runners are deprecated and will be removed on 2024-06-28
3 participants