-
Notifications
You must be signed in to change notification settings - Fork 93
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
Showing
1 changed file
with
9 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ jobs: | |
# (*) "artefact" for the rest of the Anglosphere | ||
#- | ||
matrix: | ||
os: [ubuntu-20.04, ubuntu-22.04] | ||
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-latest] | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Install dependencies | ||
|
@@ -58,7 +58,7 @@ jobs: | |
# | ||
# (*) "artefact" for the rest of the Anglosphere - | ||
matrix: | ||
os: [macos-12, macos-13, macos-14] | ||
os: [macos-12, macos-13, macos-latest] | ||
|
||
env: | ||
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 | ||
## 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 | ||
run: | | ||
brew unlink python@3 || true | ||
brew uninstall --ignore-dependencies python@3 || true | ||
brew unlink [email protected] || true | ||
brew uninstall --ignore-dependencies [email protected] || true | ||
brew unlink python@3 2> /dev/null || true | ||
brew uninstall --ignore-dependencies python@3 2> /dev/null || true | ||
brew unlink [email protected] 2> /dev/null || true | ||
brew uninstall --ignore-dependencies [email protected] 2> /dev/null || true | ||
for f in $(find /usr/local/bin -type l -print); do \ | ||
(readlink $f | grep -q -s "/Library") && echo Removing "$f" && rm -f "$f"; \ | ||
done || exit 0 | ||
|