From bda3de51d97cfce3ec927097ac8bbbf6732e3725 Mon Sep 17 00:00:00 2001
From: Akseli Lukkarila <akseli.lukkarila@nitor.com>
Date: Mon, 11 Nov 2024 14:47:15 +0200
Subject: [PATCH] fix path for github actions after rust workspace update

---
 .github/workflows/integration.yml |  6 ++----
 .github/workflows/pip.yml         |  2 +-
 .github/workflows/ruff.yml        |  2 +-
 .github/workflows/rust.yml        | 12 ++++++------
 Cargo.toml                        |  2 +-
 rust/build.sh                     |  2 +-
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 6560fab0..215db608 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -33,8 +33,6 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2.7.5
         if: ${{ matrix.lang == 'rust'}}
-        with:
-          workspaces: ./rust -> target
 
       - uses: actions/setup-go@v5
         if: ${{ matrix.lang == 'go'}}
@@ -86,7 +84,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: 3.x
           cache: pip
 
       - name: Install zip
@@ -237,7 +235,7 @@ jobs:
       - name: Check help output
         run: |
           echo "============================ Python-pyo3 Vault CLI ==========================="
-          vault --help
+          vault -h
           echo "------------------------------------------------------------------------------"
 
           echo "================================ Rust Vault CLI =============================="
diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
index 86f9f37d..9c631c39 100644
--- a/.github/workflows/pip.yml
+++ b/.github/workflows/pip.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Python environment
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: 3.x
           cache: pip
 
       - name: Install Python dependencies
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index b615bff8..f69e0cc4 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Python environment
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: 3.x
 
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 34b1712c..601e44c0 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -8,18 +8,18 @@ on:
     paths:
       - ".github/workflows/rust.yml"
       - "**.rs"
-      - "rust/Cargo.lock"
-      - "rust/Cargo.toml"
-      - "python-pyo3/Cargo.lock"
+      - "Cargo.lock"
+      - "Cargo.toml"
       - "python-pyo3/Cargo.toml"
+      - "rust/Cargo.toml"
   pull_request:
     paths:
       - ".github/workflows/rust.yml"
       - "**.rs"
-      - "rust/Cargo.lock"
-      - "rust/Cargo.toml"
-      - "python-pyo3/Cargo.lock"
+      - "Cargo.lock"
+      - "Cargo.toml"
       - "python-pyo3/Cargo.toml"
+      - "rust/Cargo.toml"
 
 # Cancel previous runs for PRs but not pushes to main
 concurrency:
diff --git a/Cargo.toml b/Cargo.toml
index 3f2ca71a..752dc1c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,4 @@
-# Share version definiton for both Rust and Python-pyo3 packages
+# Share version definition for both Rust and Python-pyo3 packages
 [workspace]
 members = ["rust", "python-pyo3"]
 resolver = "2"
diff --git a/rust/build.sh b/rust/build.sh
index 69abe906..4fdf2754 100755
--- a/rust/build.sh
+++ b/rust/build.sh
@@ -24,6 +24,6 @@ else
 fi
 
 rm -f "$executable"
-mv ./target/release/"$executable" "$executable"
+mv ../target/release/"$executable" "$executable"
 file "$executable"
 ./"$executable" --version