mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-11-05 21:07:52 +00:00
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:
parent
9bf55cfbfd
commit
dbe66565c9
13
.github/workflows/build-and-test-linux.yaml
vendored
13
.github/workflows/build-and-test-linux.yaml
vendored
@ -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
|
||||
|
14
.github/workflows/build-and-test-macos.yaml
vendored
14
.github/workflows/build-and-test-macos.yaml
vendored
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user