From bfd64b5f982facfa21414fc6d5fb210713f29aa0 Mon Sep 17 00:00:00 2001
From: tehut <tehut.m.g@gmail.com>
Date: Tue, 9 Sep 2025 17:02:08 -0700
Subject: [PATCH] build:replicate nomad-enterprise 557e533 (#26741)

---
 .github/actions/setup-js/action.yml |  9 ++++++++
 .github/workflows/build.yml         | 32 ++++-------------------------
 .github/workflows/release.yml       | 10 +--------
 3 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/.github/actions/setup-js/action.yml b/.github/actions/setup-js/action.yml
index a7cb52be5..a040ab64e 100644
--- a/.github/actions/setup-js/action.yml
+++ b/.github/actions/setup-js/action.yml
@@ -12,6 +12,15 @@ runs:
       with:
         run_install: false
 
+  # avoid missing pnpm cache directory causing fatal error in "Post Setup node"
+  # https://github.com/actions/setup-node/issues/1137#issuecomment-2508963254
+    - name: Ensure PNPM cache dir
+      run: |
+        pnpm_dir="$(pnpm store path --silent)"
+        echo "pnpm_dir: $pnpm_dir"
+        mkdir -pv "$pnpm_dir"
+      shell: bash
+
     - name: Setup node
       uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
       with:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fd2d798a5..36197ff05 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -116,16 +116,8 @@ jobs:
 
       - name: Build dependencies
         run: make deps
-      
-      - name: Install PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
-        with:
-          run_install: false
-      - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
-        with:
-          node-version-file: package.json
-          cache: pnpm
+
+      - uses: ./.github/actions/setup-js
 
       - name: Build prerelease
         run: make prerelease
@@ -177,15 +169,7 @@ jobs:
       - name: Build dependencies
         run: make deps
 
-      - name: Install PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
-        with:
-          run_install: false
-      - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
-        with:
-          node-version-file: package.json
-          cache: pnpm
+      - uses: ./.github/actions/setup-js
 
       - name: Build prerelease
         run: make prerelease
@@ -299,15 +283,7 @@ jobs:
       - name: Build dependencies
         run: make deps
 
-      - name: Install PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
-        with:
-          run_install: false
-      - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
-        with:
-          node-version-file: package.json
-          cache: pnpm
+      - uses: ./.github/actions/setup-js
 
       - name: Build prerelease
         run: make prerelease
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 98f9be625..2723678a2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -86,15 +86,7 @@ jobs:
         with:
           go-version: ${{ steps.get-go-version.outputs.go-version }}
 
-      - name: Install PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
-        with:
-          run_install: false
-      - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
-        with:
-          node-version-file: package.json
-          cache: pnpm
+      - uses: ./.github/actions/setup-js
 
       - name: Install dependencies
         run: |