missed some yarn flags, update cache paths

Updates cache paths to have better uniformity as well as use `yarn.lock` to handle lockfile-only changes.
getoutreach · Sep 22, 2023 · af40bf0 · af40bf0
1 parent 55ef625
commit af40bf0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/orbs/shared/commands/save_node_cache.yml b/orbs/shared/commands/save_node_cache.yml
@@ -1,7 +1,7 @@
 description: Save the current node cache at a standard path
 steps:
   - save_cache:
-      key: release-node-cache-{{ checksum "cache-version.txt" }}-{{ checksum "package.json" }}
+      key: node-release-cache-{{ checksum "cache-version.txt" }}-{{ checksum "yarn.lock" }}
       paths:
         # Loosely based on a Github action Gist for caching yarn[^1].
         #

diff --git a/orbs/shared/commands/save_node_client_cache.yml b/orbs/shared/commands/save_node_client_cache.yml
@@ -1,6 +1,7 @@
 description: Save the node client's cache at a standard path
 steps:
   - save_cache:
-      key: v1-node-client-cache-{{ checksum "cache-version.txt" }}-{{ checksum "api/clients/node/package.json" }}
+      key: node-client-cache-{{ checksum "cache-version.txt" }}-{{ checksum "api/clients/node/yarn.lock" }}
       paths:
         - api/clients/node/node_modules
+        - api/clients/node/.yarn
diff --git a/orbs/shared/commands/with_node_cache.yaml b/orbs/shared/commands/with_node_cache.yaml
@@ -6,8 +6,8 @@ parameters:
 steps:
   - restore_cache:
       keys:
-        - release-node-cache-{{ checksum "cache-version.txt" }}-{{ checksum "package.json" }}
-        - release-node-cache-{{ checksum "cache-version.txt" }}
+        - node-release-cache-{{ checksum "cache-version.txt" }}-{{ checksum "package.json" }}
+        - node-release-cache-{{ checksum "cache-version.txt" }}
   - run:
       name: Install semantic-release Dependencies
       command: yarn --immutable

diff --git a/orbs/shared/commands/with_node_client_cache.yml b/orbs/shared/commands/with_node_client_cache.yml
@@ -9,8 +9,8 @@ parameters:
 steps:
   - restore_cache:
       keys:
-        - v1-node-client-cache-{{ checksum "cache-version.txt" }}-{{ checksum "api/clients/node/package.json" }}
-        - v1-node-client-cache-{{ checksum "cache-version.txt" }}
+        - node-client-cache-{{ checksum "cache-version.txt" }}-{{ checksum "api/clients/node/package.json" }}
+        - node-client-cache-{{ checksum "cache-version.txt" }}
   - run:
       name: Install Node.js Client Dependencies
       working_directory: api/clients/node

diff --git a/orbs/shared/jobs/test_node_client.yaml b/orbs/shared/jobs/test_node_client.yaml
@@ -12,4 +12,4 @@ steps:
   - run:
       name: Test Node gRPC client
       working_directory: api/clients/node/
-      command: yarn --frozen-lockfile test-ci
+      command: yarn test-ci
diff --git a/shell/ci/release/dryrun.sh b/shell/ci/release/dryrun.sh
@@ -42,7 +42,7 @@ if [[ -z $GH_TOKEN ]]; then
   echo "Failed to read Github personal access token" >&2
 fi
 
-GH_TOKEN="$GH_TOKEN" yarn --frozen-lockfile semantic-release --dry-run
+GH_TOKEN="$GH_TOKEN" yarn semantic-release --dry-run
 
 # Handle unstable releasing for CLIs, pre-conditions for this exist
 # in the script.