From ac053fa3ed33988a6afd0021f4b6f4e3285dd3d9 Mon Sep 17 00:00:00 2001 From: Scott Willcox Date: Wed, 22 Oct 2025 13:31:15 +0200 Subject: [PATCH 1/2] GRIDEDIT-1970 removed macOS-13 runner. Added macOS-15 runner --- .github/workflows/build-and-test-feature-master.yml | 2 +- .github/workflows/build-and-test-release.yml | 2 +- .github/workflows/build-and-test-workflow.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test-feature-master.yml b/.github/workflows/build-and-test-feature-master.yml index 1402b8eabf..59e4ecfdff 100644 --- a/.github/workflows/build-and-test-feature-master.yml +++ b/.github/workflows/build-and-test-feature-master.yml @@ -20,8 +20,8 @@ jobs: fail-fast: false matrix: platform: - - macos-13 # x86_64 (free) - macos-14 # arm64 (free) + - macos-15 # arm64 build_type: - Release diff --git a/.github/workflows/build-and-test-release.yml b/.github/workflows/build-and-test-release.yml index 0fa9b172c3..9ae83bb753 100644 --- a/.github/workflows/build-and-test-release.yml +++ b/.github/workflows/build-and-test-release.yml @@ -19,9 +19,9 @@ jobs: fail-fast: false matrix: platform: - - macos-13 # x86_64 (free) - macos-13-xlarge # arm64 (billable) - macos-14 # arm64 (free) + - macos-15 # arm64 build_type: - Release diff --git a/.github/workflows/build-and-test-workflow.yml b/.github/workflows/build-and-test-workflow.yml index 3c8ede412e..e462e2d587 100644 --- a/.github/workflows/build-and-test-workflow.yml +++ b/.github/workflows/build-and-test-workflow.yml @@ -36,7 +36,7 @@ jobs: fetch-depth: 0 - name: Set Xcode version - if: inputs.platform == 'macos-13' || inputs.platform == 'macos-13-xlarge' + if: inputs.platform == 'macos-13-xlarge' || inputs.platform == 'macos-14' || inputs.platform == 'macos-15' run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer # Step: Set paths From c7af46484f2fd531b3035754ec14ee9c5f80045b Mon Sep 17 00:00:00 2001 From: Scott Willcox Date: Wed, 22 Oct 2025 13:57:08 +0200 Subject: [PATCH 2/2] GRIDEDIT-1970 removed macOS-13-xlarge runner --- .github/workflows/build-and-test-release.yml | 3 +-- .github/workflows/build-and-test-workflow.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test-release.yml b/.github/workflows/build-and-test-release.yml index 9ae83bb753..d361c029a3 100644 --- a/.github/workflows/build-and-test-release.yml +++ b/.github/workflows/build-and-test-release.yml @@ -19,8 +19,7 @@ jobs: fail-fast: false matrix: platform: - - macos-13-xlarge # arm64 (billable) - - macos-14 # arm64 (free) + - macos-14 # arm64 - macos-15 # arm64 build_type: - Release diff --git a/.github/workflows/build-and-test-workflow.yml b/.github/workflows/build-and-test-workflow.yml index e462e2d587..8e9d8cf5cc 100644 --- a/.github/workflows/build-and-test-workflow.yml +++ b/.github/workflows/build-and-test-workflow.yml @@ -36,7 +36,7 @@ jobs: fetch-depth: 0 - name: Set Xcode version - if: inputs.platform == 'macos-13-xlarge' || inputs.platform == 'macos-14' || inputs.platform == 'macos-15' + if: inputs.platform == 'macos-14' || inputs.platform == 'macos-15' run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer # Step: Set paths