Skip to content

Commit 0f9ecd1

Browse files
bscottmpkoning2
authored andcommitted
CI/CD: Update Github runners
- macos-13: Deprecated and gone. - checkout, upload-artifact: Github action script version changes. - windows-latest (aka windows-2025): Leave future TODO notes in cmake-builds.yml. It's pointless to build on windows-2025 since there is no newer Visual Studio version than VS 2022 and doing so will produce the exact same package outputs.
1 parent 4747b27 commit 0f9ecd1

2 files changed

Lines changed: 38 additions & 32 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
uses: ./.github/workflows/cmake-builds.yml
1818

1919
makefile:
20+
name: "Legacy makefile"
2021
runs-on: ${{ matrix.os }}
2122
strategy:
2223
#-

.github/workflows/cmake-builds.yml

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
matrix:
2020
os: [ubuntu-22.04, ubuntu-latest]
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- name: Install dependencies
2424
run: |
2525
sh -ex .travis/deps.sh linux
@@ -40,7 +40,7 @@ jobs:
4040
cd cmake/build-ninja
4141
cpack -G DEB -C Release
4242
- name: Upload DEB
43-
uses: actions/upload-artifact@v4
43+
uses: actions/upload-artifact@v5
4444
with:
4545
name: simh-4.1.0-x86_64-${{matrix.os}}.deb
4646
path: cmake/build-ninja/simh-4.1.0-x86_64-${{matrix.os}}.deb
@@ -60,13 +60,13 @@ jobs:
6060
#
6161
# As of 18 NOV 2024, Github deprecated macos-12.
6262
matrix:
63-
os: [macos-13, macos-14, macos-latest]
63+
os: [macos-14, macos-latest]
6464

6565
env:
6666
CPACK_SUFFIX: ${{matrix.os != 'macos-14' && 'x86_64' || 'm1'}}.${{matrix.os}}
6767

6868
steps:
69-
- uses: actions/checkout@v4
69+
- uses: actions/checkout@v5
7070

7171
## Nuke homebrew and start with a clean instance.
7272
- name: Reinstall HomeBrew (macOS)
@@ -102,23 +102,23 @@ jobs:
102102
cpack -G DragNDrop -C Release
103103
104104
- name: Upload ZIP
105-
uses: actions/upload-artifact@v4
105+
uses: actions/upload-artifact@v5
106106
with:
107107
name: simh-4.1.0-${{env.CPACK_SUFFIX}}.zip
108108
path: cmake/build-xcode/simh-4.1.0-${{env.CPACK_SUFFIX}}.zip
109109

110110
- name: Upload DMG
111-
uses: actions/upload-artifact@v4
111+
uses: actions/upload-artifact@v5
112112
with:
113113
name: simh-4.1.0-${{env.CPACK_SUFFIX}}.dmg
114114
path: cmake/build-xcode/simh-4.1.0-${{env.CPACK_SUFFIX}}.dmg
115115

116116

117117
cmake-vs2022xp:
118-
name: VS 2022 XP-compatible LEGACY
118+
name: LEGACY XP executables
119119
runs-on: windows-latest
120120
steps:
121-
- uses: actions/checkout@v4
121+
- uses: actions/checkout@v5
122122
- name: Install v141_xp (XP toolkit) and build SIMH
123123
shell: pwsh
124124
run: |
@@ -172,33 +172,38 @@ jobs:
172172
cd cmake\build-vs2022-xp
173173
cpack -G "ZIP;WIX" -C Release
174174
- name: Upload ZIP
175-
uses: actions/upload-artifact@v4
175+
uses: actions/upload-artifact@v5
176176
with:
177177
name: simh-4.1.0-win32-vs2022xp.zip
178178
path: cmake/build-vs2022-xp/simh-4.1.0-win32-xp.zip
179179
- name: Upload MSI
180-
uses: actions/upload-artifact@v4
180+
uses: actions/upload-artifact@v5
181181
with:
182182
name: simh-4.1.0-win32-vs2022xp.msi
183183
path: cmake/build-vs2022-xp/simh-4.1.0-win32-xp.msi
184184

185-
cmake-vs2022:
186-
name: VS 2022 Win10 native VCPKG
187-
runs-on: windows-latest
185+
## Visual Studio: The open-simh CMake workflow does not make use of windows-latest (aka windows-2025).
186+
##
187+
## There is only Visual Studio 2022, so it's pointless to build on both Windows 2022 and Windows 2025
188+
## to produce identical artifacts/artefacts.
189+
##
190+
## TODO: When there is a new Visual Studio release, update matrix.os, remove matrix.build. Use the
191+
## ${{ fromJSON ... }} hack to look up the cmake-builder.ps1 flavor corresponding to the Visual
192+
## Studio installation.
193+
##
194+
## TODO: windows-2025 does not have NSIS, so will have to conditionalize the NSIS installer and
195+
## EXE package upload, e.g., if: ${{ matrix.os == "windows-2022" }}
196+
197+
cmake-vstudio:
198+
name: Visual Studio w/VCPKG executables
199+
runs-on: ${{matrix.os}}
188200
strategy:
189-
#-
190-
# The CMake builds produce artifacts (*) and the runner image's name is
191-
# used in the artifact's name, simh-4.1.0-x86_64-ubuntu-20.04.deb.
192-
# Consequently, each runner image is enumerated for each artifact (*)
193-
# that the build produces.
194-
#
195-
# (*) "artefact" for the rest of the Anglosphere
196-
#-
197201
matrix:
202+
os: [windows-2022]
198203
build: [vs2022]
199204
steps:
200-
- uses: actions/checkout@v4
201-
- name: vs2022 build
205+
- uses: actions/checkout@v5
206+
- name: ${{ matrix.build }} build
202207
shell: pwsh
203208
run: |
204209
$ErrorActionPreference="Stop"
@@ -220,8 +225,8 @@ jobs:
220225
shell: pwsh
221226
run: |
222227
./cmake/cmake-builder.ps1 -flavor ${{matrix.build}} -config Release -testOnly
223-
## Install isn't strictly necessary, but it's a good way to see what dependencies
224-
## (IMPORTED_RUNTIME_ARTIFACTS) get installed.
228+
## Install isn't strictly necessary, but it's a good way to see what dependencies
229+
## (IMPORTED_RUNTIME_ARTIFACTS) get installed.
225230
- name: Install
226231
shell: pwsh
227232
run: |
@@ -231,18 +236,18 @@ jobs:
231236
run: |
232237
cd cmake\build-${{matrix.build}}
233238
cpack -G "NSIS;WIX;ZIP" -C Release
234-
- name: Upload ZIP
235-
uses: actions/upload-artifact@v4
236-
with:
237-
name: simh-4.1.0-${{matrix.build}}.zip
238-
path: cmake/build-${{matrix.build}}/simh-4.1.0-${{matrix.build}}.zip
239239
- name: Upload EXE installer
240-
uses: actions/upload-artifact@v4
240+
uses: actions/upload-artifact@v5
241241
with:
242242
name: simh-4.1.0-${{matrix.build}}.exe
243243
path: cmake/build-${{matrix.build}}/simh-4.1.0-${{matrix.build}}.exe
244+
- name: Upload ZIP
245+
uses: actions/upload-artifact@v5
246+
with:
247+
name: simh-4.1.0-${{matrix.build}}.zip
248+
path: cmake/build-${{matrix.build}}/simh-4.1.0-${{matrix.build}}.zip
244249
- name: Upload MSI installer
245-
uses: actions/upload-artifact@v4
250+
uses: actions/upload-artifact@v5
246251
with:
247252
name: simh-4.1.0-${{matrix.build}}.msi
248253
path: cmake/build-${{matrix.build}}/simh-4.1.0-${{matrix.build}}.msi

0 commit comments

Comments
 (0)