Skip to content

Conversation

@peterzhuamazon
Copy link
Member

@peterzhuamazon peterzhuamazon commented Jul 16, 2025

Description

Replace macos-14 and macos-13 with macos-15 and macos-15-intel as deprecation by 2025/11

Related Issues

#13417 (comment)

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@peterzhuamazon peterzhuamazon marked this pull request as draft July 17, 2025 15:34
@peterzhuamazon
Copy link
Member Author

Adding @reta to give some ideas on this, also @msfroh .

Thanks.

@reta
Copy link
Contributor

reta commented Jul 17, 2025

Adding @reta to give some ideas on this, also @msfroh .

Thanks @peterzhuamazon , let's keep in draft for now

@msfroh
Copy link
Contributor

msfroh commented Aug 4, 2025

I just noticed this PR as I ran into this same issue over on https://github.com/msfroh/cluster-etcd/pull/10, as I added a dependency on Docker and was using macos-latest.

I was wondering if it would be possible to use self-hosted runners running on one of the cloud providers to get newer Macs. Unfortunately, it looks like AWS doesn't offer M3/M4 Macs yet, and none of the other big cloud providers seem to offer Macs at all (from what I could find).

I did some Googling to see if I could find any options for cloud-based Macs that support M3/M4s. I found this Reddit post with some links to smaller providers that offer M4 Macs with 16GB of RAM for ~$120/month or 99€/month, depending on which one you pick. Of course, then we would need someone to maintain those instances.

@opensearch-trigger-bot
Copy link
Contributor

This PR is stalled because it has been open for 30 days with no activity.

@opensearch-trigger-bot opensearch-trigger-bot bot added the stalled Issues that have stalled label Sep 4, 2025
@peterzhuamazon
Copy link
Member Author

peterzhuamazon commented Sep 18, 2025

I think github has make the latest tag change live now.

@opensearch-trigger-bot opensearch-trigger-bot bot removed the stalled Issues that have stalled label Sep 19, 2025
@peterzhuamazon peterzhuamazon marked this pull request as ready for review November 4, 2025 20:47
@peterzhuamazon
Copy link
Member Author

Hi @andrross @reta,

I think we are ready to merge this.

GitHub has introduced macos-15-intel to replace macos-13 which is intel based.
And macos-15 to upgrade from macos-14 as arm64.

Let me know if we can approve and merge, we might need to update the required checks after this.

Thanks.

@peterzhuamazon peterzhuamazon added backport 2.19 backport 3.3 Backport to 3.3 branch labels Nov 4, 2025
@peterzhuamazon peterzhuamazon changed the title Remove macos-13 from workflows as it will be deprecated by 2025/11/14 Replace macos-14 and macos-13 with macos-15 and macos-15 intel as deprecation by 2025/11 Nov 4, 2025
@peterzhuamazon
Copy link
Member Author

macos-15-intel being the slowest tests of all 😅
Screenshot 2025-11-04 at 4 17 12 PM

@peterzhuamazon peterzhuamazon merged commit 2f7e9c7 into opensearch-project:main Nov 4, 2025
31 checks passed
@github-project-automation github-project-automation bot moved this from 👀 In Review to ✅ Done in Engineering Effectiveness Board Nov 4, 2025
@peterzhuamazon peterzhuamazon deleted the update-macos-workflows branch November 4, 2025 22:44
@peterzhuamazon peterzhuamazon changed the title Replace macos-14 and macos-13 with macos-15 and macos-15 intel as deprecation by 2025/11 Replace macos-14 and macos-13 with macos-15 and macos-15-intel as deprecation by 2025/11 Nov 4, 2025
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.19 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.19 2.19
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.19
# Create a new branch
git switch --create backport/backport-18772-to-2.19
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2f7e9c7e1d6644973297e741eca197b23f789e81
# Push it to GitHub
git push --set-upstream origin backport/backport-18772-to-2.19
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.19

Then, create a pull request where the base branch is 2.19 and the compare/head branch is backport/backport-18772-to-2.19.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 3.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-3.3 3.3
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-3.3
# Create a new branch
git switch --create backport/backport-18772-to-3.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2f7e9c7e1d6644973297e741eca197b23f789e81
# Push it to GitHub
git push --set-upstream origin backport/backport-18772-to-3.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-3.3

Then, create a pull request where the base branch is 3.3 and the compare/head branch is backport/backport-18772-to-3.3.

@peterzhuamazon
Copy link
Member Author

Backport #19892

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

5 participants