From dbe66565c9c8f4fb4bef1e76d2c6d4c36a56b58b Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Mon, 26 Dec 2022 13:54:10 -0500 Subject: [PATCH] Use the cmake commands here instead. (#1346) * Use the cmake commands here instead. * This command requires a dir arg. * Use ctest command here. * Limit CI to main & PRs. --- .github/workflows/build-and-test-linux.yaml | 13 +++++++++---- .github/workflows/build-and-test-macos.yaml | 14 ++++++++++---- Dockerfile | 4 ++-- appimage/build.sh | 4 ++-- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-test-linux.yaml b/.github/workflows/build-and-test-linux.yaml index 727957a5..f0cf4c78 100644 --- a/.github/workflows/build-and-test-linux.yaml +++ b/.github/workflows/build-and-test-linux.yaml @@ -1,5 +1,11 @@ name: Build and test on Linux -on: [push, pull_request] +on: + push: + branches: + - main + pull_request: + branches: + - main concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -137,8 +143,7 @@ jobs: -DCMAKE_CXX_COMPILER=$CXX \ -DMAINTAINER_MODE=ON - name: Compile - working-directory: build - run: ninja + run: cmake --build build - name: Test working-directory: build - run: ninja test + run: ctest diff --git a/.github/workflows/build-and-test-macos.yaml b/.github/workflows/build-and-test-macos.yaml index 23003186..adf160ea 100644 --- a/.github/workflows/build-and-test-macos.yaml +++ b/.github/workflows/build-and-test-macos.yaml @@ -1,5 +1,12 @@ name: Build and test on macOS -on: [push, pull_request] +on: + push: + branches: + - main + pull_request: + branches: + - main + concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -36,8 +43,7 @@ jobs: -DBUILD_WAYLAND=OFF \ -DBUILD_TESTS=ON - name: Compile - working-directory: build - run: ninja + run: cmake --build build - name: Test working-directory: build - run: ninja test + run: ctest diff --git a/Dockerfile b/Dockerfile index efd2db8c..6691041e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -104,8 +104,8 @@ RUN sh -c 'if [ "$X11" = "yes" ] ; then \ -DBUILD_XMMS2=ON \ ../ \ ; fi' \ - && ninja \ - && ninja install + && cmake --build . \ + && cmake --install . FROM ubuntu:jammy diff --git a/appimage/build.sh b/appimage/build.sh index 6cd258d9..3c357035 100755 --- a/appimage/build.sh +++ b/appimage/build.sh @@ -56,8 +56,8 @@ cmake -G Ninja \ "$REPO_ROOT" # build project and install files into AppDir -ninja -ninja install +cmake --build . +cmake --install . wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage