From 4f0dcec1b6f09f7bfe13ac63fc662a4475798418 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Mon, 4 Nov 2024 14:57:35 -0500 Subject: [PATCH 1/4] update macos images to minimum 13 and add ARM64 support --- .github/workflows/build-macos.yml | 18 +++++++++++++++--- .github/workflows/build-python.yml | 8 ++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index e4c78bf67c..44a29d42c4 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -25,15 +25,22 @@ jobs: # Github Actions requires a single row to be added to the build matrix. # See https://help.github.com/en/articles/workflow-syntax-for-github-actions. name: [ - macos-12-xcode-14.2, + macos-13-xcode-14.2, + macos-13-arm64-xcode-14.2, macos-14-xcode-15.4, + macos-14-arm64-xcode-15.4, ] build_type: [Debug, Release] build_unstable: [ON] include: - - name: macos-12-xcode-14.2 - os: macos-12 + - name: macos-13-xcode-14.2 + os: macos-13 + compiler: xcode + version: "14.2" + + - name: macos-13-arm64-xcode-14.2 + os: macos-13-xlarge compiler: xcode version: "14.2" @@ -42,6 +49,11 @@ jobs: compiler: xcode version: "15.4" + - name: macos-14-arm64-xcode-15.4 + os: macos-14-xlarge + compiler: xcode + version: "15.4" + steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index f581a5974f..248b766d54 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -30,7 +30,7 @@ jobs: [ ubuntu-20.04-gcc-9, ubuntu-20.04-clang-9, - macos-12-xcode-14.2, + macos-14-arm64-xcode-15.4, macos-14-xcode-15.4, windows-2022-msbuild, ] @@ -48,10 +48,10 @@ jobs: compiler: clang version: "9" - - name: macos-12-xcode-14.2 - os: macos-12 + - name: macos-14-arm64-xcode-15.4 + os: macos-14-xlarge compiler: xcode - version: "14.2" + version: "15.4" - name: macos-14-xcode-15.4 os: macos-14 From 2fc11f386a4a3c9a9c518258cf1f8042a703fb13 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Mon, 4 Nov 2024 19:27:14 -0500 Subject: [PATCH 2/4] fix yaml file --- .github/workflows/build-macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 44a29d42c4..56b1af35c0 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -39,7 +39,7 @@ jobs: compiler: xcode version: "14.2" - - name: macos-13-arm64-xcode-14.2 + - name: macos-13-arm64-xcode-14.2 os: macos-13-xlarge compiler: xcode version: "14.2" @@ -49,7 +49,7 @@ jobs: compiler: xcode version: "15.4" - - name: macos-14-arm64-xcode-15.4 + - name: macos-14-arm64-xcode-15.4 os: macos-14-xlarge compiler: xcode version: "15.4" From 53e78c6b43af0cb478f0e5e87c19b3521202eb7c Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Mon, 4 Nov 2024 19:35:50 -0500 Subject: [PATCH 3/4] don't use large or xlarge runners since our payment plan doesn't support those --- .github/workflows/build-macos.yml | 12 ------------ .github/workflows/build-python.yml | 6 ------ 2 files changed, 18 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 56b1af35c0..e519164ec3 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -26,9 +26,7 @@ jobs: # See https://help.github.com/en/articles/workflow-syntax-for-github-actions. name: [ macos-13-xcode-14.2, - macos-13-arm64-xcode-14.2, macos-14-xcode-15.4, - macos-14-arm64-xcode-15.4, ] build_type: [Debug, Release] @@ -39,21 +37,11 @@ jobs: compiler: xcode version: "14.2" - - name: macos-13-arm64-xcode-14.2 - os: macos-13-xlarge - compiler: xcode - version: "14.2" - - name: macos-14-xcode-15.4 os: macos-14 compiler: xcode version: "15.4" - - name: macos-14-arm64-xcode-15.4 - os: macos-14-xlarge - compiler: xcode - version: "15.4" - steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index 248b766d54..8206ffd3e9 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -30,7 +30,6 @@ jobs: [ ubuntu-20.04-gcc-9, ubuntu-20.04-clang-9, - macos-14-arm64-xcode-15.4, macos-14-xcode-15.4, windows-2022-msbuild, ] @@ -48,11 +47,6 @@ jobs: compiler: clang version: "9" - - name: macos-14-arm64-xcode-15.4 - os: macos-14-xlarge - compiler: xcode - version: "15.4" - - name: macos-14-xcode-15.4 os: macos-14 compiler: xcode From 16f9d4460dcd47be85400d67c0bdb60e9bb9c6df Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Tue, 5 Nov 2024 09:35:12 -0500 Subject: [PATCH 4/4] update macos-12 to macos-13 --- .github/workflows/build-python.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index 8206ffd3e9..24a7f6c90e 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -30,6 +30,7 @@ jobs: [ ubuntu-20.04-gcc-9, ubuntu-20.04-clang-9, + macos-13-xcode-14.2, macos-14-xcode-15.4, windows-2022-msbuild, ] @@ -47,6 +48,11 @@ jobs: compiler: clang version: "9" + - name: macos-13-xcode-14.2 + os: macos-13 + compiler: xcode + version: "14.2" + - name: macos-14-xcode-15.4 os: macos-14 compiler: xcode