folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Github: Update runner names

Browse source 
Update maOS the macos-14 runner name to macos-latest. Reduce the
runner's output when dealing with the leftover Python3 artifacts in
/usr/local.

Add the ubuntu-latest runner to the Ubuntu matrix.
This commit is contained in:
B. Scott Michel 2024-09-27 15:54:54 -07:00 • committed by Paul Koning
parent 96de0f0da2
commit 3e9d8cf864
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.github/workflows/cmake-builds.yml vendored
View file

@ -17,7 +17,7 @@ jobs:
# (*) "artefact" for the rest of the Anglosphere # (*) "artefact" for the rest of the Anglosphere
#- #-
matrix: matrix:
os: [ubuntu-20.04, ubuntu-22.04] os: [ubuntu-20.04, ubuntu-22.04, ubuntu-latest]
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
@ -58,7 +58,7 @@ jobs:
# #
# (*) "artefact" for the rest of the Anglosphere - # (*) "artefact" for the rest of the Anglosphere -
matrix: matrix:
os: [macos-12, macos-13, macos-14] os: [macos-12, macos-13, macos-latest]
env: env:
CPACK_SUFFIX: ${{matrix.os != 'macos-14' && 'x86_64' || 'm1'}}.${{matrix.os}} CPACK_SUFFIX: ${{matrix.os != 'macos-14' && 'x86_64' || 'm1'}}.${{matrix.os}}
@ -71,12 +71,15 @@ jobs:
## ##
## Future: Will have to keep an eye on SDL_ttf's Python dependency ## Future: Will have to keep an eye on SDL_ttf's Python dependency
## so that the correct/appropriate Python version is removed. ## so that the correct/appropriate Python version is removed.
##
## Redirect stderr to /dev/null so that GH doesn't emit useless failure
## messages.
- name: Remnant symlink cleanup - name: Remnant symlink cleanup
run: | run: |
brew unlink python@3 || true brew unlink python@3 2> /dev/null || true
brew uninstall --ignore-dependencies python@3 || true brew uninstall --ignore-dependencies python@3 2> /dev/null || true
brew unlink python@3.12 || true brew unlink python@3.12 2> /dev/null || true
brew uninstall --ignore-dependencies python@3.12 || true brew uninstall --ignore-dependencies python@3.12 2> /dev/null || true
for f in $(find /usr/local/bin -type l -print); do \ for f in $(find /usr/local/bin -type l -print); do \
(readlink $f | grep -q -s "/Library") && echo Removing "$f" && rm -f "$f"; \ (readlink $f | grep -q -s "/Library") && echo Removing "$f" && rm -f "$f"; \
done || exit 0 done || exit 0