Skip to content

Commit ff316a0

Browse files
committed
image-rs: fix CDH build in integration test
Now libcryptsetup does not support musl build for it cannot be linked statically, thus we use gnu to build cdh in the test. Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
1 parent 51ba644 commit ff316a0

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

‎.github/workflows/image_rs_build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ jobs:
6262
sudo apt-get update
6363
sudo apt-get install -y libdevmapper-dev
6464
if: matrix.instance == 'ubuntu-24.04'
65+
66+
- name: Install cryptsetup
67+
run: |
68+
sudo apt-get install -y libcryptsetup-dev pkg-config
69+
if: matrix.instance == 'ubuntu-24.04' || matrix.instance == 'ubuntu-24.04-arm'
6570

6671
- name: Install cross-compliation support dependencies
6772
run: |

‎image-rs/scripts/build_confidential_data_hub.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ CDH_DIR=$SCRIPT_DIR/../../confidential-data-hub
1919

2020
pushd $CDH_DIR
2121

22-
make RESOURCE_PROVIDER=none KMS_PROVIDER=none RPC="${RPC}"
23-
make DESTDIR="${SCRIPT_DIR}/${RPC}" install
22+
make RESOURCE_PROVIDER=none KMS_PROVIDER=none RPC="${RPC}" LIBC=gnu
23+
make DESTDIR="${SCRIPT_DIR}/${RPC}" install LIBC=gnu
2424

2525
file "${SCRIPT_DIR}/${RPC}/confidential-data-hub"
2626
popd

0 commit comments

Comments
 (0)