ci: improve caching

.github/actions/docker/action.yaml

@@ -37,6 +37,9 @@ inputs:
   aws_secret_access_key:
     description: AWS secret access key
     required: true
+  cache_to_name:
+    description: 'Save cache to name manifest (should be used only on default branch)'
+    default: 'false'
 outputs:
   digest:
     value: ${{ steps.docker_build.outputs.digest }}
@@ -79,6 +82,7 @@ runs:
         name: ${{ inputs.image_name }}
         region: ${{ inputs.region }}
         bucket: ${{ inputs.bucket }}
+        cache_to_name: ${{ inputs.cache_to_name }}
 
     - name: Set HOME variable to github context
       shell: bash

.github/actions/s3-layer-cache-settings/action.yaml

@@ -25,6 +25,9 @@ inputs:
   mode:
     description: Cache mode
     default: max
+  cache_to_name:
+    description: 'Save cache to name manifest (should be used only on default branch)'
+    default: 'false'
 
 outputs:
   cache_to:
@@ -41,14 +44,6 @@ runs:
       id: script
       with:
         script: |
-          const sanitizedHeadRef = '${{ inputs.head_ref }}'.replace(/[^a-zA-Z0-9]/g, '-');
-
-          const manifestNames = [
-            '${{ inputs.name }}_sha_${{ github.sha }}',
-            `${{ inputs.name }}_tag_${ sanitizedHeadRef }`,
-            '${{ inputs.name }}' // TODO: must be only on default branch
-          ];
-
           const settings = {
             type: 's3',
             region: '${{ inputs.region }}',
@@ -61,9 +56,30 @@ runs:
             .map(([key, value]) => `${key}=${value}`)
             .join(',');
 
-          const cacheFrom = manifestNames
+          const sanitizedHeadRef = '${{ inputs.head_ref }}'.replace(/[^a-zA-Z0-9]/g, '-');
+
+          const shaManifestName = '${{ inputs.name }}_sha_${{ github.sha }}';
+          const headRefManifestName = '${{ inputs.name }}_tag_${ sanitizedHeadRef }';
+
+          const cacheFromManifestNames = [
+            shaManifestName,
+            headRefManifestName,
+            '${{ inputs.name }}',
+          ];
+
+          const cacheFrom = cacheFromManifestNames
             .map((name) => `${settingsString},name=${name}`)
             .join('\n');
 
           core.setOutput('cache_from', cacheFrom);
-          core.setOutput('cache_to', `${settingsString},mode=${{ inputs.mode }},name=${manifestNames.join(';')}`);
+
+          const cacheToManifestNames = [
+            shaManifestName,
+            headRefManifestName,
+          ];
+
+          if ('${{ inputs.cache_to_name }}' === 'true') {
+            cacheToManifestNames.push('${{ inputs.name }}');
+          }
+
+          core.setOutput('cache_to', `${settingsString},mode=${{ inputs.mode }},name=${cacheToManifestNames.join(';')}`);

.github/workflows/tests-build-image.yml

@@ -48,3 +48,4 @@ jobs:
           region: ${{ secrets.AWS_REGION }}
           aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          cache_to_name: ${{ github.event_name == 'push' && 'true' || 'false' }}

package.json

@@ -92,7 +92,8 @@
     "ws": "^8.17.1",
     "body-parser": "^1.20.3",
     "path-to-regexp": "^1.9.0",
-    "cookie": "^0.7.0"
+    "cookie": "^0.7.0",
+    "cross-spawn": "^7.0.5"
   },
   "dependencies": {
     "node-gyp": "^10.0.1"

yarn.lock

@@ -6273,27 +6273,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:7.0.3, cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "cross-spawn@npm:7.0.3"
+"cross-spawn@npm:^7.0.5":
+  version: 7.0.5
+  resolution: "cross-spawn@npm:7.0.5"
   dependencies:
     path-key: "npm:^3.1.0"
     shebang-command: "npm:^2.0.0"
     which: "npm:^2.0.1"
-  checksum: e1a13869d2f57d974de0d9ef7acbf69dc6937db20b918525a01dacb5032129bd552d290d886d981e99f1b624cb03657084cc87bd40f115c07ecf376821c729ce
-  languageName: node
-  linkType: hard
-
-"cross-spawn@npm:^6.0.5":
-  version: 6.0.5
-  resolution: "cross-spawn@npm:6.0.5"
-  dependencies:
-    nice-try: "npm:^1.0.4"
-    path-key: "npm:^2.0.1"
-    semver: "npm:^5.5.0"
-    shebang-command: "npm:^1.2.0"
-    which: "npm:^1.2.9"
-  checksum: f07e643b4875f26adffcd7f13bc68d9dff20cf395f8ed6f43a23f3ee24fc3a80a870a32b246fd074e514c8fd7da5f978ac6a7668346eec57aa87bac89c1ed3a1
+  checksum: c95062469d4bdbc1f099454d01c0e77177a3733012d41bf907a71eb8d22d2add43b5adf6a0a14ef4e7feaf804082714d6c262ef4557a1c480b86786c120d18e2
   languageName: node
   linkType: hard
 
@@ -11450,13 +11437,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nice-try@npm:^1.0.4":
-  version: 1.0.5
-  resolution: "nice-try@npm:1.0.5"
-  checksum: 0b4af3b5bb5d86c289f7a026303d192a7eb4417231fe47245c460baeabae7277bcd8fd9c728fb6bd62c30b3e15cd6620373e2cf33353b095d8b403d3e8a15aff
-  languageName: node
-  linkType: hard
-
 "nise@npm:^5.1.5":
   version: 5.1.5
   resolution: "nise@npm:5.1.5"
@@ -12566,13 +12546,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-key@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "path-key@npm:2.0.1"
-  checksum: 6e654864e34386a2a8e6bf72cf664dcabb76574dd54013add770b374384d438aca95f4357bb26935b514a4e4c2c9b19e191f2200b282422a76ee038b9258c5e7
-  languageName: node
-  linkType: hard
-
 "path-key@npm:^3.0.0, path-key@npm:^3.1.0":
   version: 3.1.1
   resolution: "path-key@npm:3.1.1"
@@ -13893,15 +13866,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shebang-command@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "shebang-command@npm:1.2.0"
-  dependencies:
-    shebang-regex: "npm:^1.0.0"
-  checksum: 9eed1750301e622961ba5d588af2212505e96770ec376a37ab678f965795e995ade7ed44910f5d3d3cb5e10165a1847f52d3348c64e146b8be922f7707958908
-  languageName: node
-  linkType: hard
-
 "shebang-command@npm:^2.0.0":
   version: 2.0.0
   resolution: "shebang-command@npm:2.0.0"
@@ -13911,13 +13875,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shebang-regex@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "shebang-regex@npm:1.0.0"
-  checksum: 404c5a752cd40f94591dfd9346da40a735a05139dac890ffc229afba610854d8799aaa52f87f7e0c94c5007f2c6af55bdcaeb584b56691926c5eaf41dc8f1372
-  languageName: node
-  linkType: hard
-
 "shebang-regex@npm:^3.0.0":
   version: 3.0.0
   resolution: "shebang-regex@npm:3.0.0"
@@ -16047,7 +16004,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which@npm:^1.2.1, which@npm:^1.2.9":
+"which@npm:^1.2.1":
   version: 1.3.1
   resolution: "which@npm:1.3.1"
   dependencies: