gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use macOS 14 in CI (#1335)

Browse Source
This commit is contained in:
Eldred Habert
2024-08-08 22:16:32 +02:00
committed by GitHub
parent 0adff57e2c
commit fb6f861a08
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/scripts/install_deps.sh vendored
View File

@@ -9,7 +9,7 @@ case "${1%-*}" in
macos) macos)
brew install bison libpng pkg-config md5sha1sum brew install bison libpng pkg-config md5sha1sum
# For the version check below exclusively, re-do this before building # For the version check below exclusively, re-do this before building
export PATH="/usr/local/opt/bison/bin:$PATH" export PATH="/opt/homebrew/opt/bison/bin:/usr/local/opt/bison/bin:$PATH"
;; ;;
*) *)
echo "WARNING: Cannot install deps for OS '$1'" echo "WARNING: Cannot install deps for OS '$1'"

4
.github/workflows/create-release-artifacts.yml vendored
View File

@@ -67,7 +67,7 @@ jobs:
path: rgbds-${{ env.version }}-win${{ matrix.bits }}.zip path: rgbds-${{ env.version }}-win${{ matrix.bits }}.zip
macos: macos:
runs-on: macos-12 runs-on: macos-14
steps: steps:
- name: Get version from tag - name: Get version from tag
shell: bash shell: bash
@@ -78,7 +78,7 @@ jobs:
- name: Install deps - name: Install deps
shell: bash shell: bash
run: | run: |
./.github/scripts/install_deps.sh macos-latest ./.github/scripts/install_deps.sh macos
# We force linking libpng statically; the other libs are provided by macOS itself # We force linking libpng statically; the other libs are provided by macOS itself
- name: Build binaries - name: Build binaries
run: | run: |

21
.github/workflows/testing.yml vendored
View File

@@ -7,12 +7,12 @@ jobs:
unix: unix:
strategy: strategy:
matrix: matrix:
os: [ubuntu-20.04, ubuntu-22.04, macos-12] os: [ubuntu-20.04, ubuntu-22.04, macos-14]
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++`. # Don't use `g++` on macOS; it's just an alias to `clang++`.
- os: macos-12 - os: macos-14
cxx: g++ cxx: g++
fail-fast: false fail-fast: false
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@@ -27,13 +27,13 @@ jobs:
- name: Build & install using Make - name: Build & install using Make
if: matrix.buildsys == 'make' if: matrix.buildsys == 'make'
run: | run: |
export PATH="/usr/local/opt/bison/bin:$PATH" export PATH="/opt/homebrew/opt/bison/bin:/usr/local/opt/bison/bin:$PATH"
make develop -kj Q= CXX=${{ matrix.cxx }} make develop -kj Q= CXX=${{ matrix.cxx }}
sudo make install -j Q= sudo make install -j Q=
- name: Build & install using CMake - name: Build & install using CMake
if: matrix.buildsys == 'cmake' if: matrix.buildsys == 'cmake'
run: | run: |
export PATH="/usr/local/opt/bison/bin:$PATH" export PATH="/opt/homebrew/opt/bison/bin:/usr/local/opt/bison/bin:$PATH"
cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DSANITIZERS=ON -DMORE_WARNINGS=ON cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DSANITIZERS=ON -DMORE_WARNINGS=ON
cmake --build build -j --verbose cmake --build build -j --verbose
cp build/src/rgb{asm,link,fix,gfx} . cp build/src/rgb{asm,link,fix,gfx} .
@@ -77,24 +77,19 @@ jobs:
CXX=${{ matrix.cxx }} test/run-tests.sh CXX=${{ matrix.cxx }} test/run-tests.sh
macos-static: macos-static:
strategy: runs-on: macos-14
matrix:
# Don't run on macOS 11; our setup makes clang segfault (YES).
os: [macos-12]
fail-fast: false
runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Install deps - name: Install deps
shell: bash shell: bash
run: | run: |
./.github/scripts/install_deps.sh ${{ matrix.os }} ./.github/scripts/install_deps.sh macos
# 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 # instead of the outdated one preinstalled on macOS (which doesn't
# even support `-Wall`...). # even support `-Wall`...).
- name: Build & install - name: Build & install
run: | run: |
export PATH="/usr/local/opt/bison/bin:$PATH" export PATH="/opt/homebrew/opt/bison/bin:/usr/local/opt/bison/bin:$PATH"
make -kj CXXFLAGS="-O3 -flto -DNDEBUG -mmacosx-version-min=10.9" PKG_CONFIG="pkg-config --static" PNGLDLIBS="$(pkg-config --static --libs-only-L libpng | cut -c 3-)/libpng.a $(pkg-config --static --libs-only-l libpng | sed s/-lpng[0-9]*//g)" Q= make -kj CXXFLAGS="-O3 -flto -DNDEBUG -mmacosx-version-min=10.9" PKG_CONFIG="pkg-config --static" PNGLDLIBS="$(pkg-config --static --libs-only-L libpng | cut -c 3-)/libpng.a $(pkg-config --static --libs-only-l libpng | sed s/-lpng[0-9]*//g)" Q=
- name: Package binaries - name: Package binaries
run: | run: |
@@ -127,7 +122,7 @@ jobs:
- name: Install test dependency dependencies - name: Install test dependency dependencies
shell: bash shell: bash
run: | run: |
test/fetch-test-deps.sh --get-deps ${{ matrix.os }} test/fetch-test-deps.sh --get-deps macos
- name: Run tests - name: Run tests
shell: bash shell: bash
run: | run: |

5
test/fetch-test-deps.sh
View File

@@ -52,7 +52,10 @@ case "$actionname" in
# libbet depends on PIL to build # libbet depends on PIL to build
if [ "$2" = "libbet" ]; then if [ "$2" = "libbet" ]; then
case "${osname%-*}" in case "${osname%-*}" in
ubuntu|macos) macos)
python3 -m pip install --break-system-packages pillow
;;
ubuntu)
python3 -m pip install pillow python3 -m pip install pillow
;; ;;
windows) windows)