From cf19879281a953cbf754673be9a212c874971857 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sat, 5 Feb 2022 14:22:42 +0100 Subject: [PATCH] Enable `make develop` on all Unix platforms We are actually already doing it, so simplify the code --- .github/workflows/testing.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 81396f8a..f671039b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -16,19 +16,6 @@ jobs: cc: gcc - os: macos-11.0 cc: gcc - include: - - os: ubuntu-18.04 - target: develop - cmakevars: -DSANITIZERS=ON -DMORE_WARNINGS=ON -DCMAKE_BUILD_TYPE=Debug - - os: ubuntu-20.04 - target: develop - cmakevars: -DSANITIZERS=ON -DMORE_WARNINGS=ON -DCMAKE_BUILD_TYPE=Debug - - os: macos-11.0 - target: develop - cmakevars: -DSANITIZERS=ON -DMORE_WARNINGS=ON -DCMAKE_BUILD_TYPE=Debug - - os: macos-10.15 - target: develop - cmakevars: -DSANITIZERS=ON -DMORE_WARNINGS=ON -DCMAKE_BUILD_TYPE=Debug fail-fast: false runs-on: ${{ matrix.os }} steps: @@ -43,13 +30,13 @@ jobs: - name: Build & install using Make run: | export PATH="/usr/local/opt/bison/bin:$PATH" - make ${{ matrix.target }} -j Q= CC=${{ matrix.cc }} + make develop -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 -S . -B build -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=${{ matrix.cc }} -DSANITIZERS=ON -DMORE_WARNINGS=ON cmake --build build -j cp build/src/rgb{asm,link,fix,gfx} . sudo cmake --install build