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.
This commit is contained in:
Brenden Matthews 2022-12-26 13:54:10 -05:00 committed by GitHub
parent 9bf55cfbfd
commit dbe66565c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 12 deletions

View File

@ -1,5 +1,11 @@
name: Build and test on Linux name: Build and test on Linux
on: [push, pull_request] on:
push:
branches:
- main
pull_request:
branches:
- main
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true
@ -137,8 +143,7 @@ jobs:
-DCMAKE_CXX_COMPILER=$CXX \ -DCMAKE_CXX_COMPILER=$CXX \
-DMAINTAINER_MODE=ON -DMAINTAINER_MODE=ON
- name: Compile - name: Compile
working-directory: build run: cmake --build build
run: ninja
- name: Test - name: Test
working-directory: build working-directory: build
run: ninja test run: ctest

View File

@ -1,5 +1,12 @@
name: Build and test on macOS name: Build and test on macOS
on: [push, pull_request] on:
push:
branches:
- main
pull_request:
branches:
- main
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true
@ -36,8 +43,7 @@ jobs:
-DBUILD_WAYLAND=OFF \ -DBUILD_WAYLAND=OFF \
-DBUILD_TESTS=ON -DBUILD_TESTS=ON
- name: Compile - name: Compile
working-directory: build run: cmake --build build
run: ninja
- name: Test - name: Test
working-directory: build working-directory: build
run: ninja test run: ctest

View File

@ -104,8 +104,8 @@ RUN sh -c 'if [ "$X11" = "yes" ] ; then \
-DBUILD_XMMS2=ON \ -DBUILD_XMMS2=ON \
../ \ ../ \
; fi' \ ; fi' \
&& ninja \ && cmake --build . \
&& ninja install && cmake --install .
FROM ubuntu:jammy FROM ubuntu:jammy

View File

@ -56,8 +56,8 @@ cmake -G Ninja \
"$REPO_ROOT" "$REPO_ROOT"
# build project and install files into AppDir # build project and install files into AppDir
ninja cmake --build .
ninja install cmake --install .
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage