Update githubactions workflows

Yubico · Aug 15, 2024 · c855691 · c855691
1 parent 8c48da8
commit c855691
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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: |