fix flatpak action

SHMModbus · Apr 1, 2024 · bc706cf · bc706cf
1 parent 8d97ba1
commit bc706cf
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 21 deletions.
diff --git a/.github/workflows/flatpak_test.yml b/.github/workflows/flatpak_test.yml
@@ -1,7 +1,4 @@
-on:
-  push:
-    branches: [ "main", "development" ]
-  pull_request:
+on: [push, pull_request]
 name: Flatpak_test
 jobs:
   flatpak:
@@ -11,17 +8,11 @@ jobs:
       image: bilelmoussaoui/flatpak-github-actions:freedesktop-21.08
       options: --privileged
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Git config
       run: git config --global --add safe.directory /__w/dump_shm/dump_shm
 
-    - name: Init submodules
-      run: git submodule init
-
-    - name: Update submodules
-      run: git submodule update
-
     - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
       name: "Build"
       with:

diff --git a/network.koesling.test-dump-shm.yml b/network.koesling.test-dump-shm.yml
@@ -6,17 +6,46 @@ command: dump-shm
 finish-args:
   - --device=shm
 modules:
-  - name: dump-shm
-    buildsystem: simple
-    build-commands:
-      # build
-      - mkdir build
-      - cmake -B build . -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=OFF -DCOMPILER_WARNINGS=OFF
-      - cmake --build build
+  - name: cxxopts
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+    sources:
+      - type: git
+        tag: v3.2.0
+        url: https://github.com/jarro2783/cxxopts.git
+
+  - name: cxxshm
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCLANG_FORMAT=OFF
+      - -DCOMPILER_WARNINGS=OFF
+      - -DCLANG_TIDY=OFF
+    sources:
+      - type: git
+        tag: v2.0.2
+        url: https://github.com/NikolasK-source/cxxshm.git
 
-      # install
-      - mkdir -p "${FLATPAK_DEST}/bin"
-      - cp build/dump-shm ${FLATPAK_DEST}/bin
+  - name: cxxsemaphore
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCLANG_FORMAT=OFF
+      - -DCOMPILER_WARNINGS=OFF
+      - -DCLANG_TIDY=OFF
+    sources:
+      - type: git
+        tag: v2.0.2
+        url: https://github.com/NikolasK-source/cxxsemaphore.git
+
+  - name: dump-shm
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCLANG_FORMAT=OFF
+      - -DCOMPILER_WARNINGS=OFF
+      - -DCLANG_TIDY=OFF
     sources:
       - type: dir
         path: .