From 950f3ad70e1dbb255d11de01dee073a951f3c8b4 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Thu, 2 Oct 2025 23:44:25 -0400 Subject: [PATCH 1/7] macos-13 is deprecated --- .github/workflows/rc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index eec3344097..4f07e005b0 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -168,7 +168,7 @@ jobs: fail-fast: false matrix: platform: - - { runs_on: macos-13, arch: "x86_64"} + - { runs_on: macos-latest, arch: "x86_64"} - { runs_on: macos-14, arch: "aarch_64" } env: MACOSX_DEPLOYMENT_TARGET: "14.0" @@ -222,7 +222,7 @@ jobs: brew uninstall llvm || : # We can remove this when we drop support for - # macos-13. because macos-14 or later uses /opt/homebrew/ + # macos-latest. because macos-14 or later uses /opt/homebrew/ # not /usr/local/. # # Ensure updating python@XXX with the "--overwrite" option. From 93b28d524acaebb6e2843d46d8183eb5d479fa05 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Thu, 2 Oct 2025 23:49:09 -0400 Subject: [PATCH 2/7] revert pr on macos-13 --- .github/workflows/rc.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index 4f07e005b0..3ae95a36a7 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -221,10 +221,6 @@ jobs: # llvm@14 because llvm is newer than llvm@14. brew uninstall llvm || : - # We can remove this when we drop support for - # macos-latest. because macos-14 or later uses /opt/homebrew/ - # not /usr/local/. - # # Ensure updating python@XXX with the "--overwrite" option. # If python@XXX is updated without "--overwrite", it causes # a conflict error. Because Python 3 installed not by @@ -233,10 +229,10 @@ jobs: # tries to replace /usr/local/bin/2to3 and so on and causes # a conflict error. brew update - for python_package in $(brew list | grep python@ | sort -r); do + for python_package in $(brew list | grep python@); do brew install --overwrite ${python_package} done - brew install --overwrite python3 + brew install --overwrite python if [ "$(uname -m)" = "arm64" ]; then # pkg-config formula is deprecated but it's still installed From c0993d8e6c6d522dafc6db09a4f60790e0714dee Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Thu, 2 Oct 2025 23:57:38 -0400 Subject: [PATCH 3/7] update macos-latest arch --- .github/workflows/rc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index 3ae95a36a7..48653e30fb 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -168,7 +168,7 @@ jobs: fail-fast: false matrix: platform: - - { runs_on: macos-latest, arch: "x86_64"} + - { runs_on: macos-latest, arch: "aarch_64"} - { runs_on: macos-14, arch: "aarch_64" } env: MACOSX_DEPLOYMENT_TARGET: "14.0" From ea186545f41f492e98984a3fb01977e94dbf1a8a Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sat, 4 Oct 2025 14:56:16 -0700 Subject: [PATCH 4/7] replace macos-13 with macos-15-intel --- .github/workflows/rc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index 48653e30fb..fe52e4d7ec 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -168,7 +168,7 @@ jobs: fail-fast: false matrix: platform: - - { runs_on: macos-latest, arch: "aarch_64"} + - { runs_on: macos-15-intel, arch: "aarch_64"} - { runs_on: macos-14, arch: "aarch_64" } env: MACOSX_DEPLOYMENT_TARGET: "14.0" From 6f6e38890ef4d33ab4d2827ce9900928e00f8109 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sat, 4 Oct 2025 14:57:06 -0700 Subject: [PATCH 5/7] remove reinstalling python (per comment) --- .github/workflows/rc.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index fe52e4d7ec..43c85b996d 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -232,7 +232,6 @@ jobs: for python_package in $(brew list | grep python@); do brew install --overwrite ${python_package} done - brew install --overwrite python if [ "$(uname -m)" = "arm64" ]; then # pkg-config formula is deprecated but it's still installed From 560d564a7c10deed068a249c0ed96af318c7973e Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sat, 4 Oct 2025 14:59:16 -0700 Subject: [PATCH 6/7] keep x86_64 --- .github/workflows/rc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index 43c85b996d..2afaa2f35f 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -168,7 +168,7 @@ jobs: fail-fast: false matrix: platform: - - { runs_on: macos-15-intel, arch: "aarch_64"} + - { runs_on: macos-15-intel, arch: "x86_64"} - { runs_on: macos-14, arch: "aarch_64" } env: MACOSX_DEPLOYMENT_TARGET: "14.0" From 5591b8972e638f50a255e514702d992969fcf47a Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Mon, 6 Oct 2025 15:08:57 -0700 Subject: [PATCH 7/7] revert macos-13 comment --- .github/workflows/rc.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index 2afaa2f35f..e11f9ba02d 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -221,6 +221,10 @@ jobs: # llvm@14 because llvm is newer than llvm@14. brew uninstall llvm || : + # We can remove this when we drop support for + # macos-15-intel. because macos-14 or later with arm64 uses /opt/homebrew/ + # not /usr/local/. + # # Ensure updating python@XXX with the "--overwrite" option. # If python@XXX is updated without "--overwrite", it causes # a conflict error. Because Python 3 installed not by @@ -229,9 +233,10 @@ jobs: # tries to replace /usr/local/bin/2to3 and so on and causes # a conflict error. brew update - for python_package in $(brew list | grep python@); do + for python_package in $(brew list | grep python@ | sort -r); do brew install --overwrite ${python_package} done + brew install --overwrite python3 if [ "$(uname -m)" = "arm64" ]; then # pkg-config formula is deprecated but it's still installed