Skip to content

Commit 29be83d

Browse files
committed
macos-12 runner is deprecated
See actions/runner-images#10721 Newer runner does not include Tcl/Tk or SWIG, so we have to add these to the setup.
1 parent e474888 commit 29be83d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/build.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build, test and upload executables to GitHub
22
# depends on pre-installed software; see image definitions:
33
# - https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2404-Readme.md
4-
# - https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
4+
# - https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
55
# We use these tools from the runner images: git, gcc/XCode/MSVC, swig, Tcl/Tk on MacOS, pkg-config
66

77
# TODO: not building svs_viewer ('Cannot find GL, GLU, not building svs_viewer' and 'Cannot find opengl32, glu32, not building svs_viewer')
@@ -31,7 +31,7 @@ jobs:
3131
# Use v24 beta for now to get newer SWIG; TODO: change back to ubuntu-latest once it points to v24
3232
ubuntu-24.04,
3333
# latest available X86_64 target
34-
macos-12,
34+
macos-15,
3535
# latest is ARM
3636
macos-latest,
3737
]
@@ -56,12 +56,12 @@ jobs:
5656
if: startsWith(matrix.os, 'ubuntu-')
5757
run: sudo apt-get update && sudo apt-get install tcl-dev
5858

59-
- name: Setup tcl (macos-latest)
60-
if: matrix.os == 'macos-latest'
59+
- name: Setup tcl (macos)
60+
if: startsWith(matrix.os, 'macos')
6161
run: brew install tcl-tk
6262

63-
- name: Setup SWIG (macos-latest)
64-
if: matrix.os == 'macos-latest'
63+
- name: Setup SWIG (macos)
64+
if: startsWith(matrix.os, 'macos')
6565
run: brew install swig
6666

6767
- name: build
@@ -285,7 +285,7 @@ jobs:
285285
# 20.04 to preserve compatibility with testing stage
286286
ubuntu-20.04,
287287
# latest available X86_64 target
288-
macos-12,
288+
macos-14,
289289
# latest is ARM
290290
macos-latest,
291291

@@ -371,7 +371,7 @@ jobs:
371371
# linux target which supports all python versions we want to install for
372372
- ubuntu-20.04
373373
# latest available X86_64 target
374-
- macos-12
374+
- macos-14
375375
# latest is ARM
376376
- macos-latest
377377
- windows-latest

0 commit comments

Comments
 (0)