gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-05-08 10:59:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump our macOS CI runners

Browse Source
This commit is contained in:
ISSOtm
2026-04-14 01:40:05 +02:00
committed by Eldred Habert
parent ac0f93ffda
commit d48d6fe5d9
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/scripts/install_deps.sh
+5 -3
View File
@@ -2,7 +2,7 @@
# This script requires `sh` instead of `bash` because the latter is not always installed on FreeBSD. # This script requires `sh` instead of `bash` because the latter is not always installed on FreeBSD.
set -eu set -eu
case "${1%-*}" in case "${1%%-*}" in
ubuntu|debian) ubuntu|debian)
sudo apt-get -qq update sudo apt-get -qq update
sudo apt-get install -yq bison libpng-dev pkgconf sudo apt-get install -yq bison libpng-dev pkgconf
@@ -14,7 +14,8 @@ case "${1%-*}" in
brew install bison md5sha1sum make brew install bison md5sha1sum make
# Export `bison` to allow using the version we install from Homebrew, # Export `bison` to allow using the version we install from Homebrew,
# instead of the outdated one preinstalled on macOS (which doesn't even support `-Wall`...) # instead of the outdated one preinstalled on macOS (which doesn't even support `-Wall`...)
export PATH="/opt/homebrew/opt/bison/bin:$PATH" # This path ↓ is used on Intel macOS, and this one ↓ on ARM ones.
export PATH="/usr/local/opt/bison/bin:/opt/homebrew/opt/bison/bin:$PATH"
printf 'PATH=%s\n' "$PATH" >>"$GITHUB_ENV" # Make it available to later CI steps too printf 'PATH=%s\n' "$PATH" >>"$GITHUB_ENV" # Make it available to later CI steps too
;; ;;
freebsd) freebsd)
@@ -27,7 +28,8 @@ case "${1%-*}" in
bison() { win_bison "$@"; } # An alias doesn't work, so we use a function instead. bison() { win_bison "$@"; } # An alias doesn't work, so we use a function instead.
;; ;;
*) *)
echo "::error:: Cannot install deps for OS '$1'" echo "Cannot install deps for OS '$1'"
exit 1
;; ;;
esac esac
.github/workflows/create-release-artifacts.yml
+1 -1
View File
@@ -51,7 +51,7 @@ jobs:
if-no-files-found: error if-no-files-found: error
macos: macos:
runs-on: macos-14 runs-on: macos-26
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@v6 uses: actions/checkout@v6
.github/workflows/testing.yml
+6 -5
View File
@@ -36,11 +36,12 @@ jobs:
unix: unix:
strategy: strategy:
matrix: matrix:
os: [ubuntu-22.04, macos-14] os: [ubuntu-22.04, macos-15-intel, macos-26]
cxx: [g++, clang++] cxx: [g++, clang++]
buildsys: [make, cmake] buildsys: [make, cmake]
exclude: exclude: # Don't use `g++` on macOS; it's just an alias to `clang++`.
- { os: macos-14, cxx: g++ } # Don't use `g++` on macOS; it's just an alias to `clang++`. - { os: macos-15-intel, cxx: g++ }
- { os: macos-26, cxx: g++ }
fail-fast: false fail-fast: false
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
@@ -106,7 +107,7 @@ jobs:
ctest --test-dir build --schedule-random ctest --test-dir build --schedule-random
macos-static: macos-static:
runs-on: macos-14 runs-on: macos-26
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@v6 uses: actions/checkout@v6
@@ -145,7 +146,7 @@ jobs:
uses: actions/cache@v5 uses: actions/cache@v5
with: with:
path: ${{ fromJSON(steps.test-deps-cache-params.outputs.paths) }} path: ${{ fromJSON(steps.test-deps-cache-params.outputs.paths) }}
key: macos-14-${{ steps.test-deps-cache-params.outputs.hash }} key: macos-26-${{ steps.test-deps-cache-params.outputs.hash }}
- name: Fetch test dependency repositories - name: Fetch test dependency repositories
if: steps.test-deps-cache.outputs.cache-hit != 'true' if: steps.test-deps-cache.outputs.cache-hit != 'true'
continue-on-error: true continue-on-error: true
test/fetch-test-deps.sh
+1 -1
View File
@@ -58,7 +58,7 @@ case "$actionname" in
action() { # _ _ repo _ action() { # _ _ repo _
# libbet depends on PIL to build # libbet depends on PIL to build
if [ "$3" = "libbet" ]; then if [ "$3" = "libbet" ]; then
case "${osname%-*}" in case "${osname%%-*}" in
ubuntu | debian) ubuntu | debian)
sudo apt-get install python3-pil sudo apt-get install python3-pil
;; ;;