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

Fix CI on macOS

Browse Source 
Apple supplies version 2.3 (from 2006!!), which doesn't support `%empty`.
This commit is contained in:
ISSOtm
2021-01-23 01:50:17 +01:00
parent 70bbb098d3
commit 6623b1dc45
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/install_deps.sh vendored
View File

@@ -4,7 +4,9 @@ case `echo $1 | cut -d '-' -f 1` in
sudo apt-get install -yq bison libpng-dev pkg-config sudo apt-get install -yq bison libpng-dev pkg-config
;; ;;
macos) macos)
brew install libpng pkg-config md5sha1sum 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"
;; ;;
*) *)
echo "WARNING: Cannot install deps for OS '$1'" echo "WARNING: Cannot install deps for OS '$1'"

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

@@ -27,13 +27,18 @@ jobs:
shell: bash shell: bash
run: | run: |
./.github/actions/install_deps.sh ${{ matrix.os }} ./.github/actions/install_deps.sh ${{ matrix.os }}
# The `export` lines are to allow working on macOS...
# Apple's base version is severely outdated, not even supporting -Wall,
# but it overrides Homebrew's version nonetheless...
- name: Build & install using Make - name: Build & install using Make
run: | run: |
export PATH="/usr/local/opt/bison/bin:$PATH"
make ${{ matrix.target }} -j Q= CC=${{ matrix.cc }} make ${{ matrix.target }} -j Q= CC=${{ matrix.cc }}
sudo make install -j Q= sudo make install -j Q=
if: matrix.buildsys == 'make' if: matrix.buildsys == 'make'
- name: Build & install using CMake - name: Build & install using CMake
run: | run: |
export PATH="/usr/local/opt/bison/bin:$PATH"
cmake -S . -B build -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${{ matrix.cc }} ${{ matrix.cmakevars }} cmake -S . -B build -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${{ matrix.cc }} ${{ matrix.cmakevars }}
cmake --build build cmake --build build
cp build/src/rgb{asm,link,fix,gfx} . cp build/src/rgb{asm,link,fix,gfx} .