ref: 6623b1dc458633d344c83a4ba8f0310f9c6a3090
parent: 70bbb098d3b76909d27e0bff3c331f774073dfb0
author: ISSOtm <[email protected]>
date: Fri Jan 22 20:50:17 EST 2021
Fix CI on macOS Apple supplies version 2.3 (from 2006!!), which doesn't support `%empty`.
--- a/.github/actions/install_deps.sh
+++ b/.github/actions/install_deps.sh
@@ -4,7 +4,9 @@
sudo apt-get install -yq bison libpng-dev pkg-config
;;
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'"
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -27,13 +27,18 @@
shell: bash
run: |
./.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
run: |
+ export PATH="/usr/local/opt/bison/bin:$PATH"
make ${{ matrix.target }} -j Q= CC=${{ matrix.cc }}sudo make install -j Q=
if: matrix.buildsys == 'make'
- name: Build & install using CMake
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 --build build
cp build/src/rgb{asm,link,fix,gfx} .