Conquer cdh_basic.yml

BbolroC · Jun 10, 2024 · 471b0d6 · 471b0d6
1 parent 2941043
commit 471b0d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/cdh_basic.yml b/.github/workflows/cdh_basic.yml
@@ -24,12 +24,15 @@ jobs:
     defaults:
       run:
         working-directory: ./confidential-data-hub
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
+        instance:
+          - ubuntu-latest
+          - s390x-test
         rust:
           - stable
+    runs-on: ${{ matrix.instance }}
     steps:
       - name: Code checkout
         uses: actions/checkout@v4
@@ -50,15 +53,13 @@ jobs:
 
       - name: Build and install
         run: |
-          make RESOURCE_PROVIDER=kbs,sev && make install
+          mkdir -p ${HOME}/.local/bin
+          make RESOURCE_PROVIDER=kbs,sev && make install PREFIX=${HOME}/.local
 
       - name: Musl build
         run: |
           make LIBC=musl
-
-      - name: s390x build
-        run:
-          make ARCH=s390x
+        if: matrix.instance == 'ubuntu-latest'
 
       - name: Run cargo test
         uses: actions-rs/cargo@v1

diff --git a/confidential-data-hub/secret/src/bin/secret_cli.rs b/confidential-data-hub/secret/src/bin/secret_cli.rs
@@ -84,6 +84,9 @@ enum EnvelopeArgs {
     /// Intel eHSM driver to seal the envelope
     #[cfg(feature = "ehsm")]
     Ehsm(EhsmProviderArgs),
+
+    /// Dummy driver to prevent the unreachable pattern for neither aliyun nor ehsm
+    Dummy,
 }
 
 #[cfg(feature = "aliyun")]