Skip to content

Commit 2cd5a6f

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

1 file changed

Lines changed: 17 additions & 16 deletions

File tree

.github/workflows/build.yml

Lines changed: 17 additions & 16 deletions
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-15-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
@@ -98,14 +98,15 @@ jobs:
9898
PYTHONUTF8: 1
9999
run: python3 TestPythonSML.py
100100

101-
# different install directory for macos-latest, since tcl-tk default in homebrew is now 9.0
102-
- name: SML Tcl tests (macos-latest)
103-
if: matrix.os == 'macos-latest'
101+
# different install directory, since tcl-tk default in homebrew is now 9.0, and we only support 8
102+
# see https://github.com/SoarGroup/Soar/issues/524
103+
- name: SML Tcl tests (macos)
104+
if: startsWith(matrix.os, 'macos')
104105
working-directory: ./out
105106
run: $(brew --prefix tcl-tk@8)/bin/tclsh TestTclSML.tcl
106107

107-
- name: SML Tcl tests
108-
if: matrix.os != 'macos-latest'
108+
- name: SML Tcl tests (ubuntu)
109+
if: ! startsWith(matrix.os, 'macos')
109110
working-directory: ./out
110111
run: tclsh TestTclSML.tcl
111112

@@ -285,7 +286,7 @@ jobs:
285286
# 20.04 to preserve compatibility with testing stage
286287
ubuntu-20.04,
287288
# latest available X86_64 target
288-
macos-12,
289+
macos-15,
289290
# latest is ARM
290291
macos-latest,
291292

@@ -315,11 +316,11 @@ jobs:
315316
# run: sudo apt-get update && sudo apt-get install tcl-dev
316317

317318
# - name: Setup tcl (macos-latest)
318-
# if: matrix.os == 'macos-latest'
319+
# if: startsWith(matrix.os, 'macos')
319320
# run: brew install tcl-tk
320321

321-
- name: Setup SWIG (macos-latest)
322-
if: matrix.os == 'macos-latest'
322+
- name: Setup SWIG (macos)
323+
if: startsWith(matrix.os, 'macos')
323324
run: brew install swig
324325

325326
- name: Setup SWIG (windows-latest)
@@ -371,7 +372,7 @@ jobs:
371372
# linux target which supports all python versions we want to install for
372373
- ubuntu-20.04
373374
# latest available X86_64 target
374-
- macos-12
375+
- macos-15
375376
# latest is ARM
376377
- macos-latest
377378
- windows-latest

0 commit comments

Comments
 (0)