Revert "ci: refactor cache"

This reverts commit 1dd683c.
Nugine · Oct 22, 2024 · 443e182 · 443e182
1 parent 1dd683c
commit 443e182
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 39 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -1,14 +1,5 @@
 name: "setup"
 description: "setup environment for s3s"
-inputs:
-  cache-shared-key:
-    description: "rust-cache shared-key"
-    required: false
-    default: ""
-  cache-save-if:
-    description: "rust-cache save-if"
-    required: false
-    default: true
 runs:
   using: "composite"
   steps:
@@ -18,6 +9,3 @@ runs:
         enable-cache: true
     - uses: dtolnay/rust-toolchain@stable
     - uses: Swatinem/rust-cache@v2
-      with:
-        shared-key: ${{ inputs.cache-shared-key }}
-        save-if: ${{ inputs.cache-save-if }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -86,32 +86,17 @@ jobs:
       - uses: taiki-e/install-action@cargo-audit
       - run: cargo audit -D warnings
 
-  build-e2e:
-    needs: skip-check
-    if: needs.skip-check.outputs.should_skip != 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup
-        with:
-          cache-shared-key: "e2e"
-          cache-save-if: true
-      - run: just install all
-
   mint-proxy-minio:
     name: e2e (mint, s3s-proxy, minio)
-    needs: [skip-check, build-e2e]
+    needs: skip-check
     if: needs.skip-check.outputs.should_skip != 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
-        with:
-          cache-shared-key: "e2e"
-          cache-save-if: false
-      - run: just install all
       - run: docker pull minio/mint:edge
       - run: docker pull minio/minio:latest
+      - run: just install s3s-proxy
       - run: ./scripts/e2e-mint.sh
       - run: ./scripts/report-mint.py /tmp/mint/log.json
       - uses: actions/upload-artifact@v4
@@ -121,16 +106,14 @@ jobs:
 
   e2e-fs:
     name: e2e (s3s-e2e, s3s-fs)
-    needs: [skip-check, build-e2e]
+    needs: skip-check
     if: needs.skip-check.outputs.should_skip != 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
-        with:
-          cache-shared-key: "e2e"
-          cache-save-if: false
-      - run: just install all
+      - run: just install s3s-e2e
+      - run: just install s3s-fs
       - run: ./scripts/e2e-fs.sh
       - uses: actions/upload-artifact@v4
         with:
@@ -139,15 +122,12 @@ jobs:
 
   e2e-minio:
     name: e2e (s3s-e2e, minio)
-    needs: [skip-check, build-e2e]
+    needs: skip-check
     if: needs.skip-check.outputs.should_skip != 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
-        with:
-          cache-shared-key: "e2e"
-          cache-save-if: false
-      - run: just install all
       - run: docker pull minio/minio:latest
+      - run: just install s3s-e2e
       - run: ./scripts/e2e-minio.sh