diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml index 3fae0bd..e5760b0 100644 --- a/.github/workflows/release_linux.yml +++ b/.github/workflows/release_linux.yml @@ -148,19 +148,10 @@ jobs: git clone --branch $LIBYUBIHSM_TAG https://github.com/Yubico/yubihsm-shell.git cd yubihsm-shell - if [ "${PLATFORM:0:6}" == "debian" ] || [ "$PLATFORM" == "ubuntu1804" ]; then - dpkg-buildpackage -b --no-sign - else - dpkg-buildpackage - fi - - ls - - dpkg -i ./libyubihsm*_amd64.deb - - ls /usr/lib/x86_64-linux-gnu - - + mkdir build + cd build + cmake .. -DBUILD_ONLY_LIB=ON + make - name: clone yubihsmrs working-directory: yubihsm-setup @@ -181,9 +172,9 @@ jobs: export PATH=$PATH:$HOME/.cargo/bin #YUBIHSM_LIB_DIR=$(dpkg -L libyubihsm1 | grep -e "libyubihsm.so.2$" | xargs dirname) cargo build --release - YUBIHSM_LIB_DIR=/usr/lib/x86_64-linux-gnu cargo build --release + YUBIHSM_LIB_DIR=$GITHUB_WORKSPACE/yubihsm-shell/build/lib cargo build --release + LD_LIBRARY_PATH=$GITHUB_WORKSPACE/yubihsm-shell/build/lib cargo deb --no-build strip --strip-all target/release/yubihsm-setup - cargo deb --no-build cp target/debian/*.deb $OUTPUT/ ./target/release/yubihsm-setup version