ci: fix

Author: Manuthor

.github/scripts/cargo_build.ps1

@@ -31,6 +31,9 @@ function BuildProject {
     }
     Get-ChildItem ..\..
 
+    # Check binaries
+    Get-ChildItem -Recurse target\x86_64-pc-windows-msvc\$BuildType
+
     # Check dynamic links
     $output = & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64\dumpbin.exe" /dependents target\x86_64-pc-windows-msvc\$BuildType\cosmian.exe | Select-String "libcrypto"
     if ($output) {

.github/scripts/cargo_build.sh

@@ -6,7 +6,7 @@ set -ex
 # export TARGET=x86_64-unknown-linux-gnu
 # export DEBUG_OR_RELEASE=debug
 # export OPENSSL_DIR=/usr/local/openssl
-# export SKIP_SERVICES_TESTS="--skip test_mysql --skip test_pgsql --skip test_redis --skip google_cse --skip test_all_authentications"
+# export SKIP_SERVICES_TESTS="--skip test_encrypt --skip test_create"
 
 ROOT_FOLDER=$(pwd)
 

.github/workflows/build_all.yml

@@ -21,8 +21,6 @@ jobs:
       archive-name: rhel9
       target: x86_64-unknown-linux-gnu
       debug_or_release: ${{ inputs.debug_or_release }}
-      artifacts: |
-        /usr/local/openssl/lib64/ossl-modules/legacy.so
 
   generic-linux:
     strategy:
@@ -32,14 +30,21 @@ jobs:
           - distribution: ubuntu-20.04
             archive-name: ubuntu_20_04
             target: x86_64-unknown-linux-gnu
+            prerequisites: |
+              sudo apt install librust-atk-sys-dev librust-gdk-sys-dev libssl-dev pkg-config
 
           - distribution: ubuntu-22.04
             archive-name: ubuntu_22_04
             target: x86_64-unknown-linux-gnu
+            prerequisites: |
+              sudo apt install librust-atk-sys-dev librust-gdk-sys-dev libssl-dev pkg-config
 
           - distribution: ubuntu-24.04
             archive-name: ubuntu_24_04
             target: x86_64-unknown-linux-gnu
+            prerequisites: |
+              sudo apt install libgtk-3-dev libglib2.0-dev libssl-dev pkg-config
+
     name: ${{ matrix.distribution }}
     uses: ./.github/workflows/build_generic.yml
     secrets: inherit
@@ -49,7 +54,8 @@ jobs:
       archive-name: ${{ matrix.archive-name }}
       target: ${{ matrix.target }}
       debug_or_release: ${{ inputs.debug_or_release }}
-      skip_services_tests: --skip test_mysql --skip test_postgresql --skip test_redis --skip google_cse
+      skip_services_tests: --skip test_encrypt --skip test_create
+      prerequisites: ${{ matrix.prerequisites }}
 
   generic-macos:
     strategy:
@@ -72,10 +78,9 @@ jobs:
       archive-name: ${{ matrix.archive-name }}
       target: ${{ matrix.target }}
       debug_or_release: ${{ inputs.debug_or_release }}
-      skip_services_tests: --skip test_mysql --skip test_postgresql --skip test_redis --skip google_cse
+      skip_services_tests: --skip test_encrypt --skip test_create
 
   windows-2022:
-    if: inputs.debug_or_release == 'release'
     uses: ./.github/workflows/build_windows.yml
     with:
       toolchain: ${{ inputs.toolchain }}

.github/workflows/build_generic.yml

@@ -28,6 +28,9 @@ on:
       skip_services_tests:
         required: false
         type: string
+      prerequisites:
+        required: false
+        type: string
 
 env:
   OPENSSL_DIR: /usr/local/openssl
@@ -53,6 +56,10 @@ jobs:
           toolchain: ${{ inputs.toolchain }}
           components: rustfmt, clippy
 
+      - name: Klask prerequisites
+        if: ${{ inputs.prerequisites }}
+        run: ${{ inputs.prerequisites }}
+
       - name: Local OpenSSL FIPS Install
         run: |
           sudo mkdir -p ${{ env.OPENSSL_DIR }}
@@ -107,8 +114,8 @@ jobs:
           # The current path should be /home/runner/work/cli/cli
           pwd
           find . -type f
-          chmod u+x ./cosmian
-          chmod u+x ./cosmian_gui
+          chmod u+x ./${{ inputs.debug_or_release }}/cosmian
+          chmod u+x ./${{ inputs.debug_or_release }}/cosmian_gui
 
           ./cosmian -V
           ./cosmian_gui -V
@@ -121,8 +128,8 @@ jobs:
           pwd
           ls -lah
           find . -type f
-          chmod u+x ./cosmian
-          chmod u+x ./cosmian_gui
+          chmod u+x ./${{ inputs.debug_or_release }}/cosmian
+          chmod u+x ./${{ inputs.debug_or_release }}/cosmian_gui
 
           ./cosmian -V
           ./cosmian_gui -V

.github/workflows/build_rhel9.yml

@@ -69,7 +69,6 @@ jobs:
           - 6379:6379
 
     name: ${{ inputs.archive-name }}
-    if: inputs.debug_or_release == 'release'
     runs-on: ubuntu-22.04
     container:
       image: redhat/ubi9
@@ -128,7 +127,6 @@ jobs:
 
           TARGET: ${{ inputs.target }}
           DEBUG_OR_RELEASE: ${{ inputs.debug_or_release }}
-          KMS_TEST_DB: ${{ inputs.database }}
           FEATURES: ${{ inputs.features }}
         run: |
           bash .github/scripts/cargo_build.sh
@@ -138,22 +136,18 @@ jobs:
           find target/ -type f -size ++100M -delete
 
       - name: Upload KMS for RHEL 9
-        if: inputs.database == 'redis-findex'
         uses: actions/upload-artifact@v3
         with:
           name: ${{ inputs.archive-name }}-${{ inputs.debug_or_release }}
           path: |
-            target/${{ inputs.target }}/${{ inputs.debug_or_release }}/ckms
-            target/${{ inputs.target }}/${{ inputs.debug_or_release }}/cosmian_kms_server
-            target/${{ inputs.target }}/${{ inputs.debug_or_release }}/libckms_pkcs11.*
-            target/${{ inputs.target }}/generate-rpm/cosmian_kms_server-*
-            target/${{ inputs.target }}/generate-rpm/cosmian_kms_cli-*
+            target/${{ inputs.target }}/${{ inputs.debug_or_release }}/cosmian
+            target/${{ inputs.target }}/${{ inputs.debug_or_release }}/cosmian_gui
+            target/${{ inputs.target }}/generate-rpm/cosmian_*
             ${{ inputs.artifacts }}
           retention-days: 1
           if-no-files-found: error
 
   kms-test:
-    if: inputs.database == 'redis-findex'
     needs: rhel9-tests
     name: Clean env test ${{ inputs.archive-name }}
     runs-on: ubuntu-22.04

.github/workflows/clippy.yml

@@ -29,6 +29,10 @@ jobs:
           sudo chown -R $USER:$USER /usr/local
           bash .github/scripts/local_ossl_instl.sh ${{ env.OPENSSL_DIR }}
 
+      - name: Install Klask prerequisites
+        run: |
+          sudo apt install librust-atk-sys-dev librust-gdk-sys-dev libssl-dev pkg-config
+
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ inputs.toolchain }}