From 03508119e5e4c7e8dbc124ac34b5bb757e729309 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sun, 20 Sep 2020 03:49:25 +0200 Subject: [PATCH] Use CMake in CI as well --- .github/workflows/testing.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 709d2d5a..846effb8 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -9,10 +9,12 @@ jobs: matrix: os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, macos-10.15] cc: [gcc, clang] + buildsys: [make, cmake] include: - os: ubuntu-18.04 cc: gcc target: develop + cmakevars: -DDEVELOP=ON fail-fast: false runs-on: ${{ matrix.os }} steps: @@ -21,12 +23,18 @@ jobs: shell: bash run: | ./.github/actions/install_deps.sh ${{ matrix.os }} - - name: Build + - name: Build & install using Make run: | make ${{ matrix.target }} -j Q= CC=${{ matrix.cc }} - - name: Install - run: | sudo make install -j Q= + if: matrix.buildsys == 'make' + - name: Build & install using CMake + run: | + cmake -S . -B build -DCMAKE_VERBOSE_MAKEFILE=ON ${{ matrix.cmakevars }} + cmake --build build + cp build/src/rgb{asm,link,fix,gfx} . + sudo cmake --install build + if: matrix.buildsys == 'cmake' - name: Package binaries run: | mkdir bins @@ -34,7 +42,7 @@ jobs: - name: Upload binaries uses: actions/upload-artifact@v1 with: - name: rgbds-canary-${{ matrix.os }}-${{ matrix.cc }} + name: rgbds-canary-${{ matrix.os }}-${{ matrix.cc }}-${{ matrix.buildsys }} path: bins - name: Test shell: bash