CCM-10981: wip

Author: bhansell1

.github/actions/node-modules-cache/action.yaml

@@ -0,0 +1,38 @@
+name: "Node modules cache + setup"
+description: "Setup Node, restore node_modules cache, and optionally run npm ci on cache miss"
+inputs:
+  node_version:
+    description: "Node.js version"
+    required: true
+  cache_lock_path:
+    description: "Path(s) to package-lock.json for cache key"
+    required: false
+    default: "**/package-lock.json"
+  install_on_miss:
+    description: "Run npm ci when cache is missing"
+    required: false
+    default: "false"
+runs:
+  using: "composite"
+  steps:
+    - name: "Use Node.js"
+      uses: actions/setup-node@v4
+      with:
+        node-version: "${{ inputs.node_version }}"
+        cache: "npm"
+        cache-dependency-path: "${{ inputs.cache_lock_path }}"
+    - name: "Restore node_modules from cache"
+      id: node-modules-cache
+      uses: actions/cache@v4
+      with:
+        path: |
+          node_modules
+          **/node_modules
+        key: ${{ runner.os }}-node-${{ inputs.node_version }}-${{ hashFiles(inputs.cache_lock_path) }}
+        restore-keys: |
+          ${{ runner.os }}-node-${{ inputs.node_version }}-
+    - name: "Install dependencies (cache miss)"
+      if: steps.node-modules-cache.outputs.cache-hit != 'true' && inputs.install_on_miss == 'true'
+      shell: bash
+      run: |
+        npm ci

.github/workflows/stage-2-test.yaml

@@ -48,26 +48,12 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
-      - name: "Use Node.js"
-        uses: actions/setup-node@v4
+      - name: "Repo setup (cached)"
+        uses: ./.github/actions/node-modules-cache
         with:
-          node-version: "${{ inputs.nodejs_version }}"
-          cache: "npm"
-          cache-dependency-path: "**/package-lock.json"
-      - name: "Restore node_modules from cache"
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            **/node_modules
-          key: ${{ runner.os }}-node-${{ inputs.nodejs_version }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
-      - name: "Install dependencies (cache miss)"
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: |
-          npm ci
+          node_version: "${{ inputs.nodejs_version }}"
+          cache_lock_path: "**/package-lock.json"
+          install_on_miss: "true"
 
   check-generated-dependencies:
     name: "Check generated dependencies"
@@ -77,21 +63,10 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
-      - name: "Use Node.js"
-        uses: actions/setup-node@v4
-        with:
-          node-version: "${{ inputs.nodejs_version }}"
-          cache: "npm"
-          cache-dependency-path: "**/package-lock.json"
-      - name: "Restore node_modules from cache"
-        uses: actions/cache@v4
+      - name: "Repo setup (cached)"
+        uses: ./.github/actions/node-modules-cache
         with:
-          path: |
-            node_modules
-            **/node_modules
-          key: ${{ runner.os }}-node-${{ inputs.nodejs_version }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
+          node_version: "${{ inputs.nodejs_version }}"
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present
@@ -105,21 +80,8 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
-      - name: "Use Node.js"
-        uses: actions/setup-node@v4
-        with:
-          node-version: "${{ inputs.nodejs_version }}"
-          cache: "npm"
-          cache-dependency-path: "**/package-lock.json"
-      - name: "Restore node_modules from cache"
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            **/node_modules
-          key: ${{ runner.os }}-node-${{ inputs.nodejs_version }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
+      - name: "Repo setup (cached)"
+        uses: ./.github/actions/node-modules-cache
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present
@@ -148,21 +110,8 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
-      - name: "Use Node.js"
-        uses: actions/setup-node@v4
-        with:
-          node-version: "${{ inputs.nodejs_version }}"
-          cache: "npm"
-          cache-dependency-path: "**/package-lock.json"
-      - name: "Restore node_modules from cache"
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            **/node_modules
-          key: ${{ runner.os }}-node-${{ inputs.nodejs_version }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
+      - name: "Repo setup (cached)"
+        uses: ./.github/actions/node-modules-cache
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present
@@ -178,21 +127,8 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
-      - name: "Use Node.js"
-        uses: actions/setup-node@v4
-        with:
-          node-version: "${{ inputs.nodejs_version }}"
-          cache: "npm"
-          cache-dependency-path: "**/package-lock.json"
-      - name: "Restore node_modules from cache"
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            **/node_modules
-          key: ${{ runner.os }}-node-${{ inputs.nodejs_version }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
+      - name: "Repo setup (cached)"
+        uses: ./.github/actions/node-modules-cache
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present