@catladder/pipeline 3.25.0 → 3.26.0

package/examples/__snapshots__/meteor-kubernetes.test.ts.snap

@@ -103,7 +103,7 @@ before_script:
     local section_title="\${1}"
       echo -e "section_end:\`date +%s\`:\${section_title}\\r\\e[0K"
     }
-web 🛡 audit:
+'web 🛡 audit | dev ':
   stage: test
   image: path/to/docker/jobs-default:the-version
   variables:
@@ -120,9 +120,6 @@ web 🛡 audit:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: &a1
     max: 2
@@ -131,7 +128,7 @@ web 🛡 audit:
       - stuck_or_timeout_failure
   interruptible: true
   allow_failure: true
-web 👮 lint:
+'web 👮 lint | dev ':
   stage: test
   image: path/to/docker/jobs-default:the-version
   variables:
@@ -168,13 +165,10 @@ web 👮 lint:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
   interruptible: true
-web 🧪 test:
+'web 🧪 test | dev ':
   stage: test
   image: path/to/docker/jobs-testing-chrome:the-version
   variables:
@@ -211,9 +205,6 @@ web 🧪 test:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
   interruptible: true
@@ -504,17 +495,17 @@ web 🧪 test:
     - when: on_success
       if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs:
-    - job: web 👮 lint
+    - job: 'web 👮 lint | dev '
       artifacts: false
     - job: 'web 🔨 app | dev '
       artifacts: false
     - job: 'web 🔨 docker | dev '
       artifacts: false
-    - job: web 🧪 test
+    - job: 'web 🧪 test | dev '
       artifacts: false
     - job: 'web 🧾 sbom | dev '
       artifacts: true
-    - job: web 🛡 audit
+    - job: 'web 🛡 audit | dev '
       artifacts: false
   retry: *a1
   interruptible: true
@@ -621,6 +612,115 @@ web 🧪 test:
   retry: *a1
   interruptible: true
   allow_failure: true
+'web 🛡 audit | review ':
+  stage: test
+  image: path/to/docker/jobs-default:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="app"
+    - collapseable_section_end "injectvars"
+    - cd app
+    - yarn npm audit --environment production
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
+  allow_failure: true
+'web 👮 lint | review ':
+  stage: test
+  image: path/to/docker/jobs-default:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="app"
+    - collapseable_section_end "injectvars"
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - cd app
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - collapseable_section_start "yarninstall" "Yarn install"
+    - yarn install --immutable
+    - collapseable_section_end "yarninstall"
+    - yarn lint
+  cache:
+    - key: app-yarn-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - app/.yarn
+      fallback_keys:
+        - app-yarn
+    - key: app-node-modules-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - app/node_modules
+      fallback_keys:
+        - app-node-modules
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
+'web 🧪 test | review ':
+  stage: test
+  image: path/to/docker/jobs-testing-chrome:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="app"
+    - collapseable_section_end "injectvars"
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - cd app
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - collapseable_section_start "yarninstall" "Yarn install"
+    - yarn install --immutable
+    - collapseable_section_end "yarninstall"
+    - yarn test
+  cache:
+    - key: app-yarn-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - app/.yarn
+      fallback_keys:
+        - app-yarn
+    - key: app-node-modules-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - app/node_modules
+      fallback_keys:
+        - app-node-modules
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
 'web 🔨 app | review ':
   stage: build
   image: path/to/docker/jobs-meteor:the-version
@@ -666,21 +766,27 @@ web 🧪 test:
     - TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory
     - cp ./__build_info.json ./dist/bundle/programs/server
   cache:
-    - key: app-yarn
+    - key: app-yarn-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - app/.yarn
-    - key: app-node-modules
+      fallback_keys:
+        - app-yarn
+    - key: app-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - app/node_modules
-    - key: web-meteor-build-cache
+      fallback_keys:
+        - app-node-modules
+    - key: web-meteor-build-cache-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - app/.meteor/local/resolver-result-cache.json
         - app/.meteor/local/plugin-cache
         - app/.meteor/local/isopacks
         - app/.meteor/local/bundler-cache/scanner
+      fallback_keys:
+        - web-meteor-build-cache
   artifacts:
     paths:
       - app/__build_info.json
@@ -909,17 +1015,17 @@ web 🧪 test:
     - when: on_success
       if: $CI_MERGE_REQUEST_ID
   needs:
-    - job: web 👮 lint
+    - job: 'web 👮 lint | review '
       artifacts: false
     - job: 'web 🔨 app | review '
       artifacts: false
     - job: 'web 🔨 docker | review '
       artifacts: false
-    - job: web 🧪 test
+    - job: 'web 🧪 test | review '
       artifacts: false
     - job: 'web 🧾 sbom | review '
       artifacts: true
-    - job: web 🛡 audit
+    - job: 'web 🛡 audit | review '
       artifacts: false
   retry: *a1
   interruptible: true

package/examples/__snapshots__/modify-generated-files.test.ts.snap

@@ -103,7 +103,7 @@ before_script:
     local section_title="\${1}"
       echo -e "section_end:\`date +%s\`:\${section_title}\\r\\e[0K"
     }
-api 🛡 audit:
+'api 🛡 audit | dev ':
   stage: test
   image: path/to/docker/jobs-default:the-version
   variables:
@@ -120,9 +120,6 @@ api 🛡 audit:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: &a1
     max: 2
@@ -131,7 +128,7 @@ api 🛡 audit:
       - stuck_or_timeout_failure
   interruptible: true
   allow_failure: true
-api 👮 lint:
+'api 👮 lint | dev ':
   stage: test
   image: path/to/docker/jobs-default:the-version
   variables:
@@ -168,13 +165,10 @@ api 👮 lint:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
   interruptible: true
-api 🧪 test:
+'api 🧪 test | dev ':
   stage: test
   image: path/to/docker/jobs-testing-chrome:the-version
   variables:
@@ -211,9 +205,6 @@ api 🧪 test:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
   interruptible: true
@@ -314,6 +305,115 @@ api 🧪 test:
   retry: *a1
   interruptible: true
   allow_failure: true
+'api 🛡 audit | review ':
+  stage: test
+  image: path/to/docker/jobs-default:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="api"
+    - collapseable_section_end "injectvars"
+    - cd api
+    - yarn npm audit --environment production
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
+  allow_failure: true
+'api 👮 lint | review ':
+  stage: test
+  image: path/to/docker/jobs-default:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="api"
+    - collapseable_section_end "injectvars"
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - cd api
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - collapseable_section_start "yarninstall" "Yarn install"
+    - yarn install --immutable
+    - collapseable_section_end "yarninstall"
+    - yarn lint
+  cache:
+    - key: api-yarn-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - api/.yarn
+      fallback_keys:
+        - api-yarn
+    - key: api-node-modules-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - api/node_modules
+      fallback_keys:
+        - api-node-modules
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
+'api 🧪 test | review ':
+  stage: test
+  image: path/to/docker/jobs-testing-chrome:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="api"
+    - collapseable_section_end "injectvars"
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - cd api
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - collapseable_section_start "yarninstall" "Yarn install"
+    - yarn install --immutable
+    - collapseable_section_end "yarninstall"
+    - yarn test
+  cache:
+    - key: api-yarn-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - api/.yarn
+      fallback_keys:
+        - api-yarn
+    - key: api-node-modules-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - api/node_modules
+      fallback_keys:
+        - api-node-modules
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
 'api 🔨 app | review ':
   stage: build
   image: path/to/docker/jobs-default:the-version
@@ -363,14 +463,18 @@ api 🧪 test:
     - collapseable_section_end "yarninstall"
     - yarn build
   cache:
-    - key: api-yarn
+    - key: api-yarn-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - api/.yarn
-    - key: api-node-modules
+      fallback_keys:
+        - api-yarn
+    - key: api-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - api/node_modules
+      fallback_keys:
+        - api-node-modules
   artifacts:
     paths:
       - api/__build_info.json

package/examples/__snapshots__/modify-generated-yaml.test.ts.snap

@@ -103,7 +103,7 @@ before_script:
     local section_title="\${1}"
       echo -e "section_end:\`date +%s\`:\${section_title}\\r\\e[0K"
     }
-api 🛡 audit:
+'api 🛡 audit | dev ':
   stage: test
   image: path/to/docker/jobs-default:the-version
   variables:
@@ -120,9 +120,6 @@ api 🛡 audit:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: &a1
     max: 2
@@ -131,7 +128,7 @@ api 🛡 audit:
       - stuck_or_timeout_failure
   interruptible: true
   allow_failure: true
-api 👮 lint:
+'api 👮 lint | dev ':
   stage: test
   image: path/to/docker/jobs-default:the-version
   variables:
@@ -168,13 +165,10 @@ api 👮 lint:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
   interruptible: true
-api 🧪 test:
+'api 🧪 test | dev ':
   stage: test
   image: path/to/docker/jobs-testing-chrome:the-version
   variables:
@@ -211,9 +205,6 @@ api 🧪 test:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
-    - when: never
-      if: $CI_PIPELINE_SOURCE  == "trigger"
-    - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
   interruptible: true
@@ -314,6 +305,115 @@ api 🧪 test:
   retry: *a1
   interruptible: true
   allow_failure: true
+'api 🛡 audit | review ':
+  stage: test
+  image: path/to/docker/jobs-default:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="api"
+    - collapseable_section_end "injectvars"
+    - cd api
+    - yarn npm audit --environment production
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
+  allow_failure: true
+'api 👮 lint | review ':
+  stage: test
+  image: path/to/docker/jobs-default:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="api"
+    - collapseable_section_end "injectvars"
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - cd api
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - collapseable_section_start "yarninstall" "Yarn install"
+    - yarn install --immutable
+    - collapseable_section_end "yarninstall"
+    - yarn lint
+  cache:
+    - key: api-yarn-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - api/.yarn
+      fallback_keys:
+        - api-yarn
+    - key: api-node-modules-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - api/node_modules
+      fallback_keys:
+        - api-node-modules
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
+'api 🧪 test | review ':
+  stage: test
+  image: path/to/docker/jobs-testing-chrome:the-version
+  variables:
+    KUBERNETES_CPU_REQUEST: '0.45'
+    KUBERNETES_MEMORY_REQUEST: 1Gi
+    KUBERNETES_MEMORY_LIMIT: 4Gi
+  script:
+    - collapseable_section_start "injectvars" "Injecting variables"
+    - export APP_PATH="api"
+    - collapseable_section_end "injectvars"
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - cd api
+    - collapseable_section_start "nodeinstall" "Ensure node version"
+    - if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi
+    - if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi
+    - collapseable_section_end "nodeinstall"
+    - collapseable_section_start "yarninstall" "Yarn install"
+    - yarn install --immutable
+    - collapseable_section_end "yarninstall"
+    - yarn test
+  cache:
+    - key: api-yarn-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - api/.yarn
+      fallback_keys:
+        - api-yarn
+    - key: api-node-modules-mr$CI_MERGE_REQUEST_IID
+      policy: pull-push
+      paths:
+        - api/node_modules
+      fallback_keys:
+        - api-node-modules
+  rules:
+    - when: never
+      if: $CI_PIPELINE_SOURCE  == "trigger"
+    - if: $CI_MERGE_REQUEST_ID
+  needs: []
+  retry: *a1
+  interruptible: true
 'api 🔨 app | review ':
   stage: build
   image: path/to/docker/jobs-default:the-version
@@ -363,14 +463,18 @@ api 🧪 test:
     - collapseable_section_end "yarninstall"
     - yarn build
   cache:
-    - key: api-yarn
+    - key: api-yarn-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - api/.yarn
-    - key: api-node-modules
+      fallback_keys:
+        - api-yarn
+    - key: api-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
       paths:
         - api/node_modules
+      fallback_keys:
+        - api-node-modules
   artifacts:
     paths:
       - api/__build_info.json