Fix cache paths

karellen · Sep 8, 2024 · 3945ded · 3945ded
1 parent 940683d
commit 3945ded
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,7 +48,6 @@ jobs:
       - name: Patch
         run: |
           ./patch.sh
-
           echo "COMMIT_SHA=$(git rev-parse HEAD:manylinux)" >> $GITHUB_ENV
 
       - name: Set up emulation
@@ -64,7 +63,7 @@ jobs:
         if: github.event_name != 'workflow_dispatch' || fromJSON(github.event.inputs.useCache)
         uses: actions/cache/restore@v4
         with:
-          path: .buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/*
+          path: manylinux/.buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/*
           key: buildx-cache-${{ matrix.policy }}-${{ matrix.platform }}
 
       - name: Build
@@ -85,7 +84,7 @@ jobs:
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         uses: actions/cache/save@v4
         with:
-          path: .buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/*
+          path: manylinux/.buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/*
           key: buildx-cache-${{ matrix.policy }}-${{ matrix.platform }}
 
       - name: Deploy

diff --git a/build.yml.patch b/build.yml.patch
@@ -1,5 +1,5 @@
 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
-index 7364c19..a86021a 100644
+index 7364c19..905ddc7 100644
 --- a/.github/workflows/build.yml
 +++ b/.github/workflows/build.yml
 @@ -9,19 +9,7 @@ on:
@@ -33,7 +33,7 @@ index 7364c19..a86021a 100644
      strategy:
        fail-fast: false
        matrix:
-@@ -52,6 +43,13 @@ jobs:
+@@ -52,6 +43,12 @@ jobs:
          uses: actions/checkout@v4
          with:
            fetch-depth: 50
@@ -42,12 +42,16 @@ index 7364c19..a86021a 100644
 +      - name: Patch
 +        run: |
 +          ./patch.sh
-+
 +          echo "COMMIT_SHA=$(git rev-parse HEAD:manylinux)" >> $GITHUB_ENV
 
        - name: Set up emulation
          if: matrix.platform != 'i686' && matrix.platform != 'x86_64'
-@@ -70,29 +68,34 @@ jobs:
+@@ -66,33 +63,38 @@ jobs:
+         if: github.event_name != 'workflow_dispatch' || fromJSON(github.event.inputs.useCache)
+         uses: actions/cache/restore@v4
+         with:
+-          path: .buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/*
++          path: manylinux/.buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/*
            key: buildx-cache-${{ matrix.policy }}-${{ matrix.platform }}
 
        - name: Build
@@ -71,7 +75,8 @@ index 7364c19..a86021a 100644
 +        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
          uses: actions/cache/save@v4
          with:
-           path: .buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/*
+-          path: .buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/*
++          path: manylinux/.buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/*
            key: buildx-cache-${{ matrix.policy }}-${{ matrix.platform }}
 
        - name: Deploy