ci: fix region and home

dashpay · Nov 14, 2024 · 163323c · 163323c
1 parent 3b65eeb
commit 163323c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
@@ -77,16 +77,21 @@ runs:
       id: layer_cache_settings
       with:
         name: ${{ inputs.image_name }}
+        region: ${{ inputs.region }}
         bucket: ${{ inputs.bucket }}
 
+    - name: Set HOME variable to github context
+      shell: bash
+      run: echo "HOME=$HOME" >> $GITHUB_ENV
+
     - name: Cargo cache for Docker
       uses: actions/cache@v4
       id: cargo-cache
       with:
         path: |
-          ${{ env.RUNNER_TEMP }}/cargo-cache-registry-index
-          ${{ env.RUNNER_TEMP }}/cargo-cache-registry-cache
-          ${{ env.RUNNER_TEMP }}/cargo-cache-git-db
+          ${{ env.HOME }}/cargo-cache-registry-index
+          ${{ env.HOME }}/cargo-cache-registry-cache
+          ${{ env.HOME }}/cargo-cache-git-db
         key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
         restore-keys: |
           - ${{ runner.os }}-cargo-
@@ -96,15 +101,15 @@ runs:
       with:
         cache-map: |
           {
-            "${{ env.RUNNER_TEMP }}/cargo-cache-registry-index": {
+            "${{ env.HOME }}/cargo-cache-registry-index": {
               "target": "/root/.cargo/registry/index",
               "id": "cargo_registry_index"
             },
-            "${{ env.RUNNER_TEMP }}/cargo-cache-registry-cache": {
+            "${{ env.HOME }}/cargo-cache-registry-cache": {
               "target": "/root/.cargo/registry/cache",
               "id": "cargo_registry_cache"
             },
-            "${{ env.RUNNER_TEMP }}/cargo-cache-git-db": {
+            "${{ env.HOME }}/cargo-cache-git-db": {
               "target": "/root/.cargo/git/db",
               "id": "cargo_git"
             }
@@ -115,7 +120,7 @@ runs:
       uses: actions/cache@v4
       id: yarn-cache
       with:
-        path: ${{ env.RUNNER_TEMP }}/yarn-unplugged-cache
+        path: ${{ env.HOME }}/yarn-unplugged-cache
         key: ${{ inputs.platform }}-yarn-unplugged-${{ hashFiles('yarn.lock') }}
         restore-keys: |
           - ${{ inputs.platform }}-yarn-unplugged-
@@ -132,7 +137,7 @@ runs:
       with:
         cache-map: |
           {
-            "${{ env.RUNNER_TEMP }}/yarn-unplugged-cache": {
+            "${{ env.HOME }}/yarn-unplugged-cache": {
               "target": "/tmp/unplugged",
               "id": "unplugged_${{ steps.arch.outputs.result }}"
             }

diff --git a/.github/actions/s3-layer-cache-settings/action.yaml b/.github/actions/s3-layer-cache-settings/action.yaml
@@ -15,10 +15,10 @@ inputs:
     default: ${{ github.ref }}
   region:
     description: S3 region
-    default: eu-west-1
+    required: true
   bucket:
     description: S3 bucket name
-    default: multi-runner-cache-x1xibo9c
+    required: true
   prefix:
     description: S3 key prefix
     default: 'cache-layers/'