ci: fix cache from

dashpay · Nov 14, 2024 · 9cdea04 · 9cdea04
1 parent 163323c
commit 9cdea04
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
@@ -157,13 +157,12 @@ runs:
         platforms: ${{ inputs.platform }}
         build-args: |
           CARGO_BUILD_PROFILE=${{ inputs.cargo_profile }}
-#          RUSTC_WRAPPER=sccache
-#          SCCACHE_BUCKET=${{ inputs.bucket }}
-#          SCCACHE_REGION=${{ inputs.region }}
-#          SCCACHE_S3_KEY_PREFIX=${{ runner.os }}/sccache
-#          AWS_ACCESS_KEY_ID=${{ inputs.aws_access_key_id }}
-#          AWS_SECRET_ACCESS_KEY=${{ inputs.aws_secret_access_key }}
-#          AWS_REGION=${{ inputs.region }}
+          RUSTC_WRAPPER=sccache
+          SCCACHE_BUCKET=${{ inputs.bucket }}
+          SCCACHE_REGION=${{ inputs.region }}
+          SCCACHE_S3_KEY_PREFIX=${{ runner.os }}/sccache
+          AWS_ACCESS_KEY_ID=${{ inputs.aws_access_key_id }}
+          AWS_SECRET_ACCESS_KEY=${{ inputs.aws_secret_access_key }}
         cache-from: ${{ steps.layer_cache_settings.outputs.cache_from }}
         cache-to: ${{ steps.layer_cache_settings.outputs.cache_to }}
 #        cache-from: type=registry,ref=${{ inputs.image_org }}/${{ inputs.image_name }}:build-cache

diff --git a/.github/actions/s3-layer-cache-settings/action.yaml b/.github/actions/s3-layer-cache-settings/action.yaml
@@ -54,13 +54,16 @@ runs:
             region: '${{ inputs.region }}',
             bucket: '${{ inputs.bucket }}',
             prefix: '${{ inputs.prefix }}',
-            name: manifestNames.join(';'),
           };
 
           const settingsString = Object.entries(settings)
             .filter(([,value]) => value !== '')
             .map(([key, value]) => `${key}=${value}`)
             .join(',');
 
-          core.setOutput('cache_from', settingsString);
-          core.setOutput('cache_to', `${settingsString},mode=${{ inputs.mode }}`);
+          const cacheFrom = manifestNames
+            .map((name) => `${settingsString},name=${name}`)
+            .join('\n');
+
+          core.setOutput('cache_from', cacheFrom);
+          core.setOutput('cache_to', `${settingsString},mode=${{ inputs.mode }},name=${manifestNames.join(';')}`);
diff --git a/Dockerfile b/Dockerfile
@@ -181,7 +181,7 @@ RUN <<EOS
         echo "export AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}" >> /root/env
         # AWS_SECRET_ACCESS_KEY is a secret so we load it using ONBUILD ARG later on
         echo "export SCCACHE_BUCKET='${SCCACHE_BUCKET}'" >> /root/env
-        echo "export SCCACHE_S3_USE_SSL=true" >> /root/env
+#        echo "export SCCACHE_S3_USE_SSL=true" >> /root/env
         echo "export SCCACHE_S3_KEY_PREFIX='${SCCACHE_S3_KEY_PREFIX}/${TARGETARCH}/linux-musl'" >> /root/env
     elif [ -n "${SCCACHE_MEMCACHED}" ]; then
         # memcached