Revamp GitHub Actions cache keys

PyO3 · Nov 2, 2022 · fca1709 · fca1709
1 parent 20bf592
commit fca1709
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -147,7 +147,7 @@ jobs:
       - name: Cache cargo build
         uses: Swatinem/rust-cache@v2
         with:
-          key: maturin-${{ runner.os }}
+          shared-key: maturin-build
       - name: Cache test crates cargo build
         uses: actions/cache@v3
         with:
@@ -235,6 +235,8 @@ jobs:
           components: rust-src
           targets: wasm32-unknown-emscripten
       - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: maturin-build
       - run: pip install nox
       - name: Setup Pyodide
         run: nox -s setup-pyodide
@@ -265,7 +267,7 @@ jobs:
       - name: Cache cargo build
         uses: Swatinem/rust-cache@v2
         with:
-          key: maturin-${{ runner.os }}-alpine
+          shared-key: maturin-build
       - name: Cache test crates cargo build
         uses: actions/cache@v3
         with:
@@ -298,12 +300,12 @@ jobs:
       - name: Cache cargo build
         uses: Swatinem/rust-cache@v2
         with:
-          key: maturin-${{ runner.os }}
+          shared-key: maturin-build
       - name: Cache test crates cargo build
         uses: actions/cache@v3
         with:
-          path: test-crates/*/target
-          key: auditwheel-test-crates-${{ runner.os }}-${{ steps.rustup.outputs.cachekey }}-${{ hashFiles('test-crates/*/Cargo.lock') }}
+          path: test-crates/targets
+          key: test-crates-${{ runner.os }}-${{ steps.rustup.outputs.cachekey }}-auditwheel-${{ hashFiles('test-crates/*/Cargo.lock') }}
       - name: Compliant Build
         run: tests/manylinux_compliant.sh ${{ matrix.manylinux }}
       - name: Incompliant Build
@@ -334,7 +336,7 @@ jobs:
         with:
           path: test-crates/*/target
           # Dockerfile contains the rustc version
-          key: docker-test-crates-${{ hashFiles('Dockerfile', 'test-crates/*/Cargo.lock') }}
+          key: test-crates-docker-${{ hashFiles('Dockerfile', 'test-crates/*/Cargo.lock') }}
       - name: Test the Docker container
         run: ./test-dockerfile.sh
       # Fix permissions from docker for caching
@@ -416,7 +418,7 @@ jobs:
         if: steps.changes.outputs.changed == 'true'
         uses: Swatinem/rust-cache@v2
         with:
-          key: maturin-${{ runner.os }}-bootstrap
+          shared-key: maturin-build
       - uses: actions/setup-python@v4
         if: steps.changes.outputs.changed == 'true'
         with:
@@ -450,7 +452,7 @@ jobs:
       - name: Cache cargo build
         uses: Swatinem/rust-cache@v2
         with:
-          key: maturin-${{ runner.os }}-msrv
+          key: msrv
       - name: cargo build
         run: cargo build --all
 

diff --git a/tests/manylinux_compliant.sh b/tests/manylinux_compliant.sh
@@ -4,5 +4,5 @@ set -e
 which cargo > /dev/null 2>&1 || curl -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
 
 for PYBIN in /opt/python/cp3[789]*/bin; do
-  cargo run -- build -m test-crates/pyo3-mixed/Cargo.toml -i "${PYBIN}/python" --manylinux $1 -o dist
+  cargo run -- build -m test-crates/pyo3-mixed/Cargo.toml --target-dir test-crates/targets -i "${PYBIN}/python" --manylinux $1 -o dist
 done
diff --git a/tests/manylinux_incompliant.sh b/tests/manylinux_incompliant.sh
@@ -5,7 +5,7 @@ which cargo > /dev/null || curl -sSf https://sh.rustup.rs | sh -s -- -y --profil
 
 # Fail because we're running in manylinux2014, which can't build for manylinux 2010
 for PYBIN in /opt/python/cp3[9]*/bin; do
-  if cargo run -- build -m test-crates/pyo3-mixed/Cargo.toml -i "${PYBIN}/python" --manylinux 2010 -o dist; then
+  if cargo run -- build -m test-crates/pyo3-mixed/Cargo.toml --target-dir test-crates/targets -i "${PYBIN}/python" --manylinux 2010 -o dist; then
     echo "maturin build unexpectedly succeeded"
     exit 1
   else
@@ -17,7 +17,7 @@ done
 apt-get -v &> /dev/null && apt-get install -y zlib1g-dev || yum install -y zlib-devel
 
 for PYBIN in /opt/python/cp3[9]*/bin; do
-  if cargo run -- build -m test-crates/lib_with_disallowed_lib/Cargo.toml -i "${PYBIN}/python" --manylinux 2014 -o dist; then
+  if cargo run -- build -m test-crates/lib_with_disallowed_lib/Cargo.toml --target-dir test-crates/targets -i "${PYBIN}/python" --manylinux 2014 -o dist; then
     echo "maturin build unexpectedly succeeded"
     exit 1
   else