Merge pull request #558 from aws-amplify/main

Release fix - cache misses

Author: marcvberg

.circleci/config.base.yml

@@ -82,11 +82,11 @@ jobs:
       - run: yarn cache clean --force
       - run: yarn run production-build
       - save_cache:
-          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}-<< parameters.os >>
+          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache
       - save_cache:
-          key: amplify-codegen-ssh-deps-{{ .Branch }}-<< parameters.os >>
+          key: amplify-codegen-ssh-deps-{{ .Branch }}
           paths:
             - ~/.ssh
       - persist_to_workspace:
@@ -116,7 +116,7 @@ jobs:
             - attach_workspace:
                 at: ./
             - restore_cache:
-                key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}-l
+                key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - run:
           name: Lint
           command: yarn lint
@@ -135,8 +135,8 @@ jobs:
           at: ./
       - restore_cache:
           keys:
-            - amplify-codegen-ssh-deps-{{ .Branch }}-l
-            - amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}-l
+            - amplify-codegen-ssh-deps-{{ .Branch }}
+            - amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - run:
           name: Authenticate with npm
           command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
@@ -152,7 +152,7 @@ jobs:
       - attach_workspace:
           at: ./
       - restore_cache:
-          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}-<< parameters.os >>
+          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - run:
           name: Publish to verdaccio
           command: |
@@ -165,7 +165,7 @@ jobs:
             yarn publish-to-verdaccio
             unsetNpmRegistryUrl
       - save_cache:
-          key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}-<< parameters.os >>
+          key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
           paths:
             - ~/verdaccio-cache/
 
@@ -176,9 +176,9 @@ jobs:
       - attach_workspace:
           at: ./
       - restore_cache:
-          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}-<< parameters.os >>
+          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - restore_cache:
-          key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}-<< parameters.os >>
+          key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
       - run: *install_cli
       - run:
           name: Run e2e tests

.circleci/config.yml

@@ -6,20 +6,20 @@ orbs:
   node: circleci/[email protected]
 machine:
   environment:
-    PATH: '${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin'
+    PATH: ${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin
 executors:
   w: &ref_1
     machine:
-      image: 'windows-server-2019-vs2019:stable'
+      image: windows-server-2019-vs2019:stable
       resource_class: windows.medium
       shell: bash.exe
     working_directory: ~/repo
     environment:
-      AMPLIFY_DIR: 'C:/home/circleci/repo/out'
-      AMPLIFY_PATH: 'C:/home/circleci/repo/out/amplify.exe'
+      AMPLIFY_DIR: C:/home/circleci/repo/out
+      AMPLIFY_PATH: C:/home/circleci/repo/out/amplify.exe
   l: &ref_2
     docker:
-      - image: 'public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest'
+      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
     working_directory: ~/repo
     resource_class: large
     environment:
@@ -36,7 +36,7 @@ executors:
       AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux-x64
   a:
     docker:
-      - image: 'cimg/android:2022.09'
+      - image: cimg/android:2022.09
     working_directory: ~/repo
     resource_class: large
     environment:
@@ -77,13 +77,11 @@ jobs:
       - run: yarn cache clean --force
       - run: yarn run production-build
       - save_cache:
-          key: >-
-            amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock"
-            }}-<< parameters.os >>
+          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache
       - save_cache:
-          key: 'amplify-codegen-ssh-deps-{{ .Branch }}-<< parameters.os >>'
+          key: amplify-codegen-ssh-deps-{{ .Branch }}
           paths:
             - ~/.ssh
       - persist_to_workspace:
@@ -119,7 +117,7 @@ jobs:
             - restore_cache:
                 key: >-
                   amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum
-                  "yarn.lock" }}-l
+                  "yarn.lock" }}
       - run:
           name: Lint
           command: yarn lint
@@ -138,13 +136,11 @@ jobs:
           at: ./
       - restore_cache:
           keys:
-            - 'amplify-codegen-ssh-deps-{{ .Branch }}-l'
-            - >-
-              amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock"
-              }}-l
+            - amplify-codegen-ssh-deps-{{ .Branch }}
+            - amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - run:
           name: Authenticate with npm
-          command: 'echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc'
+          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
       - run:
           name: Publish Amplify Codegen
           command: |
@@ -157,9 +153,7 @@ jobs:
       - attach_workspace:
           at: ./
       - restore_cache:
-          key: >-
-            amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock"
-            }}-<< parameters.os >>
+          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - run:
           name: Publish to verdaccio
           command: |
@@ -172,9 +166,7 @@ jobs:
             yarn publish-to-verdaccio
             unsetNpmRegistryUrl
       - save_cache:
-          key: >-
-            amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}-<<
-            parameters.os >>
+          key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
           paths:
             - ~/verdaccio-cache/
   e2e-test:
@@ -185,13 +177,9 @@ jobs:
       - attach_workspace:
           at: ./
       - restore_cache:
-          key: >-
-            amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock"
-            }}-<< parameters.os >>
+          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - restore_cache:
-          key: >-
-            amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}-<<
-            parameters.os >>
+          key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
       - run: *ref_3
       - run:
           name: Run e2e tests
@@ -242,9 +230,9 @@ jobs:
       - attach_workspace:
           at: ./
       - restore_cache:
-          key: 'amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}'
+          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - restore_cache:
-          key: 'amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}'
+          key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
       - node/install:
           install-yarn: true
           node-version: '16.13'
@@ -274,7 +262,7 @@ jobs:
       - attach_workspace:
           at: ./
       - restore_cache:
-          key: 'amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}'
+          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - run:
           name: Run cleanup script
           command: |