Skip to content

Commit f4964a6

Browse files
committed
[CI] Update macOS runner to macos-13
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]>
1 parent 4020452 commit f4964a6

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

.github/workflows/build-instructions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
shell: cmd
5252
- os: ubuntu-22.04
5353
shell: bash
54-
- os: macos-12
54+
- os: macos-13
5555
shell: bash
5656
defaults:
5757
run:
@@ -87,7 +87,7 @@ jobs:
8787
config:
8888
- os: windows-2022
8989
- os: ubuntu-22.04
90-
- os: macos-12
90+
- os: macos-13
9191
defaults:
9292
run:
9393
shell: bash

.github/workflows/build-wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
config:
2727
- os: ubuntu-22.04
2828
shell: bash
29-
- os: macos-12
29+
- os: macos-13
3030
shell: bash
3131
- os: windows-2022
3232
preamble: call "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
shell: cmd
3333
- os: ubuntu-22.04
3434
shell: bash
35-
- os: macos-12
35+
- os: macos-13
3636
shell: bash
3737
defaults:
3838
run:

.github/workflows/integrations.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
shell: cmd
3131
- os: ubuntu-22.04
3232
shell: bash
33-
- os: macos-12
33+
- os: macos-13
3434
shell: bash
3535
defaults:
3636
run:
@@ -114,7 +114,7 @@ jobs:
114114
site-packages: Lib/site-packages
115115
- os: ubuntu-22.04
116116
site-packages: lib/python3.11/site-packages
117-
- os: macos-12
117+
- os: macos-13
118118
site-packages: lib/python3.11/site-packages
119119
defaults:
120120
run:
@@ -212,7 +212,7 @@ jobs:
212212
- os: ubuntu-22.04
213213
site-packages: lib/python3.11/site-packages
214214
shell: bash
215-
- os: macos-12
215+
- os: macos-13
216216
site-packages: lib/python3.11/site-packages
217217
shell: bash
218218
defaults:

.github/workflows/populate-cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
# config.os vs os to match requirements of bootstrap_platform
2424
config:
2525
- os: ubuntu-22.04
26-
- os: macos-12
26+
- os: macos-13
2727
- os: windows-2022
2828

2929
steps:

.github/workflows/upload-release-builds.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ jobs:
4141
- os: ubuntu-22.04
4242
shell: bash
4343
build-type: Release
44-
- os: macos-12
44+
- os: macos-13
4545
shell: bash
4646
build-type: Debug
47-
- os: macos-12
47+
- os: macos-13
4848
shell: bash
4949
build-type: RelWithDebInfo
50-
- os: macos-12
50+
- os: macos-13
5151
shell: bash
5252
build-type: Release
5353
defaults:

resources/build/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
conan==1.59.0
1+
conan==1.66.0
22
cmake==3.28.3
33
ninja==1.10.2.3
44
pip>=21.3

0 commit comments

Comments
 (0)