Skip to content

Commit

Permalink
[CI] Update macOS runner to macos-13
Browse files Browse the repository at this point in the history
Closes OpenAssetIO#1434. GitHub CI has started rejecting macOS 12, i.e.

> The macOS-12 environment is deprecated, consider switching to
> macOS-13, macOS-14 (macos-latest) or macOS-15. For more details, see
> actions/runner-images#10721

VFX Reference Platform CY2024 only specifies a Minimum Deployment Target
of 11.0 (CY2025 specifies 12.0). So we cannot match our GitHub runner to
VFX CY2024. Nearest we can do is target the lowest available macOS
version.

So update to `macos-13` runners.

The (default) available compiler on these is apple-clang 15, which isn't
an available option in Conan 1.59 ("ERROR: Invalid setting '15' is not a
valid 'settings.compiler.version' value"), so bump the version of Conan
to the latest v1 at time of writing, i.e. 1.66.

Signed-off-by: David Feltell <[email protected]>
  • Loading branch information
feltech committed Jan 3, 2025
1 parent 4020452 commit f4964a6
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-instructions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
shell: cmd
- os: ubuntu-22.04
shell: bash
- os: macos-12
- os: macos-13
shell: bash
defaults:
run:
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
config:
- os: windows-2022
- os: ubuntu-22.04
- os: macos-12
- os: macos-13
defaults:
run:
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
config:
- os: ubuntu-22.04
shell: bash
- os: macos-12
- os: macos-13
shell: bash
- os: windows-2022
preamble: call "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
shell: cmd
- os: ubuntu-22.04
shell: bash
- os: macos-12
- os: macos-13
shell: bash
defaults:
run:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
shell: cmd
- os: ubuntu-22.04
shell: bash
- os: macos-12
- os: macos-13
shell: bash
defaults:
run:
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
site-packages: Lib/site-packages
- os: ubuntu-22.04
site-packages: lib/python3.11/site-packages
- os: macos-12
- os: macos-13
site-packages: lib/python3.11/site-packages
defaults:
run:
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
- os: ubuntu-22.04
site-packages: lib/python3.11/site-packages
shell: bash
- os: macos-12
- os: macos-13
site-packages: lib/python3.11/site-packages
shell: bash
defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/populate-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
# config.os vs os to match requirements of bootstrap_platform
config:
- os: ubuntu-22.04
- os: macos-12
- os: macos-13
- os: windows-2022

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/upload-release-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ jobs:
- os: ubuntu-22.04
shell: bash
build-type: Release
- os: macos-12
- os: macos-13
shell: bash
build-type: Debug
- os: macos-12
- os: macos-13
shell: bash
build-type: RelWithDebInfo
- os: macos-12
- os: macos-13
shell: bash
build-type: Release
defaults:
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/build/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
conan==1.59.0
conan==1.66.0
cmake==3.28.3
ninja==1.10.2.3
pip>=21.3
Expand Down

0 comments on commit f4964a6

Please sign in to comment.