Skip to content

Commit 4e9b317

Browse files
committed
Revert "WIP: GitHub: drop broken cmake"
This reverts commit c3a43d8.
1 parent c3a43d8 commit 4e9b317

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

.github/workflows/build.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,22 @@ jobs:
1616
name: ubuntu-meson
1717
path: |
1818
build/
19-
example/build/
19+
example/build/ build-ubuntu:
20+
build-ubuntu-cmake:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: install ninja-build
24+
run: sudo apt update -y && sudo apt install -y ninja-build
25+
- uses: actions/checkout@v2
26+
- name: compile library
27+
run: cmake -S . -B build && cmake --build build
28+
- uses: actions/upload-artifact@v4
29+
with:
30+
name: ubuntu-cmake
31+
path: |
32+
build/
2033
collect-and-release:
21-
needs: [build-ubuntu-meson]
34+
needs: [build-ubuntu-meson, build-ubuntu-cmake]
2235
runs-on: ubuntu-latest
2336
steps:
2437
- uses: actions/checkout@v2
@@ -27,11 +40,16 @@ jobs:
2740
with:
2841
name: ubuntu-meson
2942
path: ./build-ubuntu-meson
43+
- name: Download artifact ubuntu-cmake
44+
uses: actions/download-artifact@v4
45+
with:
46+
name: ubuntu-cmake
47+
path: ./build-ubuntu-cmake
3048

3149
- name: 'Compress files for the linux-x64 release artifact'
3250
shell: bash
3351
run: |
34-
zip --junk-paths ./linux-x64.zip ./build-ubuntu-meson/build/adstool
52+
zip --junk-paths ./linux-x64.zip ./build-ubuntu-cmake/**/*.so ./build-ubuntu-cmake/**/*.so.* ./build-ubuntu-meson/build/adstool
3553
3654
- name: 'Obtain the current version number from the debian changelog. We need it to create the release.'
3755
shell: bash

0 commit comments

Comments
 (0)