- workflow fix

- bump dependencies

.github/workflows/publish_crates.yml

@@ -1,6 +1,6 @@
 name: Publish_rs
 
-on: [workflow_dispatch]
+on: [ workflow_dispatch ]
 
 permissions:
   contents: read
@@ -10,24 +10,25 @@ jobs:
     name: Publish (crates.io)
     runs-on: ubuntu-latest
     timeout-minutes: 25
+    env:
+      CARGO_HOME: ${{ github.workspace }}/.cargo
     steps:
       - uses: actions/checkout@v6
       - name: Restore cache
         uses: actions/cache/restore@v4
         with:
-          path: |
-            ~/.cargo
+          path: ${{ env.CARGO_HOME }}
           key: cache-ubuntu-cargo-publish
 
       - name: Install Rust
         run: |-
-          export PATH="${CARGO_HOME:-$HOME/.cargo}/bin:$PATH"
+          export PATH="$CARGO_HOME/bin:$PATH"
           if ! command -v rustc >/dev/null 2>&1; then
             curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
           else
             rustup update
           fi
-          echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> "$GITHUB_PATH"
+          echo "$CARGO_HOME/bin" >> "$GITHUB_PATH"
           cargo install cargo-release
         shell: bash
 
@@ -47,8 +48,9 @@ jobs:
       # which is reasonable, since this job only runs after the Linux, Windows, and WASM builds
       # have passed.
       - name: "cargo release publish"
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_IO_API_TOKEN }}
         run: |-
-          cargo login ${{ secrets.CRATES_IO_API_TOKEN }}
           cargo release \
             publish \
             --workspace \
@@ -61,6 +63,5 @@ jobs:
       - name: Store cache
         uses: actions/cache/save@v4
         with:
-          path: |
-            ~/.cargo
+          path: ${{ env.CARGO_HOME }}
           key: cache-ubuntu-cargo-publish

.github/workflows/publish_pypi.yml

@@ -1,6 +1,6 @@
 name: Publish_py
 
-on: [workflow_dispatch]
+on: [ workflow_dispatch ]
 
 permissions:
   contents: read
@@ -9,6 +9,8 @@ jobs:
   pypi_publish:
     name: Publish (pypi.org)
     runs-on: ubuntu-latest
+    env:
+      CARGO_HOME: ${{ github.workspace }}/.cargo
     steps:
       - uses: actions/checkout@v6
       - uses: actions/setup-python@v5
@@ -23,7 +25,7 @@ jobs:
             ~/.cache/pip-wheel
             ~/.cache/sccache
             ~/.cache/cargo-xwin
-            ~/.cargo
+            ${{ env.CARGO_HOME }}
             ~/.osxcross
           key: cache-ubuntu-maturin-cross-compile
 
@@ -37,17 +39,18 @@ jobs:
 
       - name: Install Rust
         run: |
-          export PATH="$HOME/.cargo/bin:$PATH"
+          export PATH="$CARGO_HOME/bin:$PATH"
           if ! command -v rustc >/dev/null 2>&1; then
             curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
           else
             rustup update
           fi
+          echo "$CARGO_HOME/bin" >> "$GITHUB_PATH"
+          cargo --version
         shell: bash
 
       - name: Install sccache and maturin
         run: |
-          export PATH="$HOME/.cargo/bin:$PATH"
           python -m pip install --upgrade pip
           pip install maturin ziglang
           if ! command -v sccache >/dev/null 2>&1; then
@@ -57,7 +60,6 @@ jobs:
 
       - name: Install xwin
         run: |
-          export PATH="$HOME/.cargo/bin:$PATH"
           if ! command -v cargo-xwin >/dev/null 2>&1; then
             cargo install cargo-xwin || pip install cargo-xwin
             cargo xwin cache xwin
@@ -75,7 +77,7 @@ jobs:
 
       - name: Build wheels
         run: |
-          export PATH="$HOME/.cargo/bin:$HOME/.osxcross/bin:$PATH"
+          export PATH="$HOME/.osxcross/bin:$PATH"
           rustup default stable
           rm -rf dist
           maturin sdist --out dist -m ome-metadata/Cargo.toml
@@ -107,7 +109,7 @@ jobs:
             ~/.cache/pip-wheel
             ~/.cache/sccache
             ~/.cache/cargo-xwin
-            ~/.cargo
+            ${{ env.CARGO_HOME }}
             ~/.osxcross
           key: cache-ubuntu-maturin-cross-compile