diff --git a/.github/scripts/install_deps.sh b/.github/scripts/install_deps.sh index ed0cf6a6c..6c225be9a 100755 --- a/.github/scripts/install_deps.sh +++ b/.github/scripts/install_deps.sh @@ -9,7 +9,7 @@ case "${1%-*}" in macos) brew install bison libpng pkg-config md5sha1sum # 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'" diff --git a/.github/workflows/create-release-artifacts.yml b/.github/workflows/create-release-artifacts.yml index 494bc33c3..453fda3bb 100644 --- a/.github/workflows/create-release-artifacts.yml +++ b/.github/workflows/create-release-artifacts.yml @@ -67,7 +67,7 @@ jobs: path: rgbds-${{ env.version }}-win${{ matrix.bits }}.zip macos: - runs-on: macos-12 + runs-on: macos-14 steps: - name: Get version from tag shell: bash diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 48971b168..528250003 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -7,12 +7,12 @@ jobs: unix: strategy: matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-12] + os: [ubuntu-20.04, ubuntu-22.04, macos-14] cxx: [g++, clang++] buildsys: [make, cmake] exclude: # Don't use `g++` on macOS; it's just an alias to `clang++`. - - os: macos-12 + - os: macos-14 cxx: g++ fail-fast: false runs-on: ${{ matrix.os }} @@ -27,13 +27,13 @@ jobs: - name: Build & install using Make if: matrix.buildsys == 'make' 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 }} sudo make install -j Q= - name: Build & install using CMake if: matrix.buildsys == 'cmake' 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 --build build -j --verbose cp build/src/rgb{asm,link,fix,gfx} . @@ -78,9 +78,7 @@ jobs: macos-static: strategy: - matrix: - # Don't run on macOS 11; our setup makes clang segfault (YES). - os: [macos-12] + os: macos-14 fail-fast: false runs-on: ${{ matrix.os }} steps: @@ -94,7 +92,7 @@ jobs: # even support `-Wall`...). - name: Build & install 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= - name: Package binaries run: | diff --git a/test/fetch-test-deps.sh b/test/fetch-test-deps.sh index 2ea72a16a..52cc510e0 100755 --- a/test/fetch-test-deps.sh +++ b/test/fetch-test-deps.sh @@ -52,7 +52,10 @@ case "$actionname" in # libbet depends on PIL to build if [ "$2" = "libbet" ]; then case "${osname%-*}" in - ubuntu|macos) + macos) + python3 -m pip install --break-system-packages pillow + ;; + ubuntu) python3 -m pip install pillow ;; windows)