From c8556911b89d1e6f6e45b95a804da28fd69d9d98 Mon Sep 17 00:00:00 2001 From: Aveen Ismail Date: Thu, 15 Aug 2024 14:48:33 +0200 Subject: [PATCH] Update githubactions workflows --- .github/workflows/release_linux.yml | 7 +++++-- .github/workflows/release_macos.yml | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml index 873d37a..1ab96db 100644 --- a/.github/workflows/release_linux.yml +++ b/.github/workflows/release_linux.yml @@ -9,7 +9,7 @@ jobs: fail-fast: false matrix: environment: [ - "ubuntu:23.04", + "ubuntu:24.04", "ubuntu:22.04", "ubuntu:20.04", "debian:12", @@ -216,11 +216,14 @@ jobs: bash ./rustup.sh -y fi + OUTPUT=$GITHUB_WORKSPACE/$PLATFORM/yubihsm-setup + mkdir -p $OUTPUT + cargo install cargo-rpm cargo rpm init YUBIHSM_LIB_DIR=$GITHUB_WORKSPACE/yubihsm-shell/build/lib cargo build --release YUBIHSM_LIB_DIR=$GITHUB_WORKSPACE/yubihsm-shell-$LIBYUBIHSM_VERSION/build/lib cargo rpm build - cp target/release/rpmbuild/RPMS/x86_64/*.rpm $GITHUB_WORKSPACE/$PLATFORM/yubihsm-setup/ + cp target/release/rpmbuild/RPMS/x86_64/*.rpm $OUTPUT/ - name: upload artifacts uses: actions/upload-artifact@v3 diff --git a/.github/workflows/release_macos.yml b/.github/workflows/release_macos.yml index 4cf2e96..38ea059 100644 --- a/.github/workflows/release_macos.yml +++ b/.github/workflows/release_macos.yml @@ -37,10 +37,11 @@ jobs: cd .. git clone https://github.com/Yubico/yubihsm-shell.git cd yubihsm-shell - mkdir build - cd build - cmake .. -DBUILD_ONLY_LIB=ON - make + mkdir build + cd build + cmake .. -DBUILD_ONLY_LIB=ON + make + pwd - name: clone yubihsmrs run: |