Skip to content

Commit aed29bc

Browse files
committed
Switch macos runners to intel variants for now
Signed-off-by: Nick Avramoussis <[email protected]>
1 parent dd1dc87 commit aed29bc

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.github/workflows/ax.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,9 @@ jobs:
123123
matrix:
124124
config:
125125
#@note llvm10 never got its own brew formula...
126-
- { runner: 'macos-latest', cxx: 'clang++', build: 'Release', llvm: '12' }
127-
- { runner: 'macos-latest', cxx: 'clang++', build: 'Release', llvm: '13' }
126+
# Last macos runner befor M1 (macos-14)
127+
- { runner: 'macos-13', cxx: 'clang++', build: 'Release', llvm: '12' }
128+
- { runner: 'macos-13', cxx: 'clang++', build: 'Release', llvm: '13' }
128129
fail-fast: false
129130
steps:
130131
- uses: actions/checkout@v3

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ jobs:
186186
github.event_name != 'workflow_dispatch' ||
187187
github.event.inputs.type == 'all' ||
188188
github.event.inputs.type == 'mac'
189-
runs-on: macos-latest
189+
runs-on: macos-13 # Last macos runner befor M1 (macos-14)
190190
env:
191191
CXX: clang++
192192
steps:

.github/workflows/weekly.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ jobs:
111111
(github.event_name != 'workflow_dispatch' ||
112112
github.event.inputs.type == 'all' ||
113113
github.event.inputs.type == 'houdini')
114+
# Note that macos-14 (current macos-latest) switches to M1. We could instead test
115+
# the arm build here instead of the x86 one.
114116
runs-on: macos-latest
115117
name: macos-houdini-20
116118
env:
@@ -291,7 +293,7 @@ jobs:
291293
github.event_name != 'workflow_dispatch' ||
292294
github.event.inputs.type == 'all' ||
293295
github.event.inputs.type == 'ax'
294-
runs-on: macos-latest
296+
runs-on: macos-13
295297
name: macos-cxx:${{ matrix.config.cxx }}-llvm:${{ matrix.config.llvm }}-${{ matrix.config.build }}
296298
env:
297299
CXX: ${{ matrix.config.cxx }}

0 commit comments

Comments
 (0)