Test

Signed-off-by: Raul Metsma <[email protected]>
metsma · Apr 30, 2024 · 1e464c4 · 1e464c4
1 parent 2ea8958
commit 1e464c4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/cmake-linux-fedora.yml b/.github/workflows/cmake-linux-fedora.yml
@@ -30,6 +30,9 @@ jobs:
       - name: Build
         run: cmake --build build --config $BUILD_TYPE --target package
 
+      - name: Test package
+        run: rpmlint build/*rpm
+
       - uses: actions/upload-artifact@v4
         with:
           name: web-eid-app-fedora-build-fedora${{matrix.container}}-${{github.run_number}}

diff --git a/.github/workflows/cmake-linux-ubuntu.yml b/.github/workflows/cmake-linux-ubuntu.yml
@@ -20,13 +20,19 @@ jobs:
         container: ['20.04', '22.04', '24.04']
 
     steps:
-      - name: Install dependencies
+      - uses: awalsh128/cache-apt-pkgs-action@latest
         if: matrix.container == '20.04'
-        run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper lintian pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev
+        with:
+          packages: git lsb-release fakeroot build-essential devscripts debhelper lintian pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev
+          version: apt-${{matrix.container}}-v1
+          execute_install_scripts: true
 
-      - name: Install dependencies
+      - uses: awalsh128/cache-apt-pkgs-action@latest
         if: matrix.container != '20.04'
-        run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper lintian pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev
+        with:
+          packages: git lsb-release fakeroot build-essential devscripts debhelper lintian pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev
+          version: apt-${{matrix.container}}-v1
+          execute_install_scripts: true
 
       - uses: actions/checkout@v4
         with:

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -169,6 +169,8 @@ else()
         DESTINATION ${CMAKE_INSTALL_DATADIR}/web-eid)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.json
         DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/chromium/native-messaging-hosts)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eu.webeid.json
+        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/opt/chrome/native-messaging-hosts)
     install(FILES ${CMAKE_SOURCE_DIR}/install/ncibgoaomkmdpilpocfeponihegamlic.json
         DESTINATION ${CMAKE_INSTALL_DATADIR}/google-chrome/extensions)
     install(FILES ${CMAKE_SOURCE_DIR}/install/ncibgoaomkmdpilpocfeponihegamlic.json