fix: support package manager retries in VS Code promotion - W-23832274

.github/actions/check-ci-status/action.yml

@@ -12,7 +12,7 @@ inputs:
     required: true
   required-checks:
     description: >
-      Comma-separated list of check names that must have succeeded.
+      JSON array of check names that must have succeeded.
       If empty, all non-skipped check-runs must have conclusion "success".
     required: false
     default: ''
@@ -49,10 +49,13 @@ runs:
         FAILED=0
 
         if [ -n "$REQUIRED_CHECKS" ]; then
+          if ! jq -e 'type == "array"' <<< "$REQUIRED_CHECKS" >/dev/null; then
+            echo "ERROR: required-checks must be a JSON array"
+            exit 1
+          fi
+
           # Only validate the specified checks
-          IFS=',' read -ra CHECKS <<< "$REQUIRED_CHECKS"
-          for CHECK in "${CHECKS[@]}"; do
-            CHECK=$(echo "$CHECK" | xargs)  # trim whitespace
+          while IFS= read -r CHECK; do
 
             # Grab the latest run for this name (check-runs are newest-first per name).
             MATCH=$(echo "$CHECK_RUNS" | jq -c --arg name "$CHECK" \
@@ -76,7 +79,7 @@ runs:
             else
               echo "PASS: required check '$CHECK' succeeded"
             fi
-          done
+          done < <(jq -r '.[]' <<< "$REQUIRED_CHECKS")
         else
           # Validate all non-skipped check-runs
           while IFS= read -r RUN; do

.github/actions/ctcOpen/action.yml

@@ -21,6 +21,18 @@ inputs:
     description: version of node to use.  It's better to specify latest, lts/* or lts/-1 than to hardcode numbers
     required: false
     default: lts/*
+  package-manager:
+    description: Package manager used by the calling repository (npm, pnpm, or yarn)
+    required: false
+    default: npm
+  package-manager-version:
+    description: pnpm version to use when package-manager is pnpm
+    required: false
+    default: '10'
+  cache-dependency-path:
+    description: Path to the calling repository's package manager lockfile
+    required: false
+    default: package-lock.json
 
 outputs:
   changeCaseId:
@@ -32,10 +44,17 @@ runs:
   steps:
     - uses: actions/checkout@v4
 
+    - name: Setup pnpm
+      if: inputs.package-manager == 'pnpm'
+      uses: pnpm/action-setup@v4
+      with:
+        version: ${{ inputs.package-manager-version }}
+
     - uses: actions/setup-node@v4
       with:
         node-version: ${{ inputs.nodeVersion }}
-        cache: npm
+        cache: ${{ inputs.package-manager }}
+        cache-dependency-path: ${{ inputs.cache-dependency-path }}
 
     - run: npm install -g @salesforce/change-case-management --omit=dev
       shell: bash

.github/actions/npmInstallWithRetries/action.yml

@@ -1,5 +1,5 @@
 name: npm-install-with-retries
-description: 'wraps npm install with retries/timeout to handle network failures'
+description: 'Wraps npm ci with retries and timeouts. New workflows should use setupNodeAndInstall for package-manager-agnostic installation.'
 inputs:
   ignore-scripts:
     default: 'false'

.github/actions/updateNodeLockfile/action.yml

@@ -0,0 +1,60 @@
+name: Update Node lockfile
+description: Refreshes an npm, pnpm, or Yarn lockfile with retries and without lifecycle scripts.
+inputs:
+  package-manager:
+    description: 'Package manager to use: npm, pnpm, or yarn.'
+    required: true
+  package-manager-version:
+    description: 'pnpm version to install when package-manager is pnpm.'
+    required: false
+    default: '10'
+  lockfile-path:
+    description: 'Path to the lockfile to refresh.'
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: Validate package manager and lockfile
+      shell: bash
+      env:
+        PACKAGE_MANAGER: ${{ inputs.package-manager }}
+        LOCKFILE_PATH: ${{ inputs.lockfile-path }}
+      run: |
+        case "$PACKAGE_MANAGER" in
+          npm|pnpm|yarn) ;;
+          *) echo "Unsupported package manager: $PACKAGE_MANAGER"; exit 1 ;;
+        esac
+        [ -f "$LOCKFILE_PATH" ] || { echo "Lockfile not found: $LOCKFILE_PATH"; exit 1; }
+
+    - name: Setup pnpm
+      if: inputs.package-manager == 'pnpm'
+      uses: pnpm/action-setup@v4
+      with:
+        version: ${{ inputs.package-manager-version }}
+
+    - name: Resolve lockfile update command
+      id: command
+      shell: bash
+      env:
+        PACKAGE_MANAGER: ${{ inputs.package-manager }}
+        LOCKFILE_PATH: ${{ inputs.lockfile-path }}
+      run: |
+        LOCKFILE_DIR=$(dirname "$LOCKFILE_PATH")
+        case "$PACKAGE_MANAGER" in
+          npm) COMMAND="cd '$LOCKFILE_DIR' && npm install --package-lock-only --ignore-scripts" ;;
+          pnpm) COMMAND="cd '$LOCKFILE_DIR' && pnpm install --lockfile-only --ignore-scripts" ;;
+          yarn)
+            YARN_MAJOR=$(yarn --version | cut -d. -f1)
+            if [ "$YARN_MAJOR" -ge 2 ]; then
+              COMMAND="cd '$LOCKFILE_DIR' && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install --mode=skip-build"
+            else
+              COMMAND="cd '$LOCKFILE_DIR' && yarn install --ignore-scripts"
+            fi
+            ;;
+        esac
+        echo "value=$COMMAND" >> "$GITHUB_OUTPUT"
+
+    - name: Refresh lockfile with retries
+      uses: salesforcecli/github-workflows/.github/actions/retry@main
+      with:
+        command: ${{ steps.command.outputs.value }}

.github/actions/vscode/check-ci-status/action.yml

@@ -12,7 +12,7 @@ inputs:
     required: true
   required-checks:
     description: >
-      Comma-separated list of check names that must have succeeded.
+      JSON array of check names that must have succeeded.
       If empty, all non-skipped check-runs must have conclusion "success".
     required: false
     default: ''
@@ -49,10 +49,13 @@ runs:
         FAILED=0
 
         if [ -n "$REQUIRED_CHECKS" ]; then
+          if ! jq -e 'type == "array"' <<< "$REQUIRED_CHECKS" >/dev/null; then
+            echo "ERROR: required-checks must be a JSON array"
+            exit 1
+          fi
+
           # Only validate the specified checks
-          IFS=',' read -ra CHECKS <<< "$REQUIRED_CHECKS"
-          for CHECK in "${CHECKS[@]}"; do
-            CHECK=$(echo "$CHECK" | xargs)  # trim whitespace
+          while IFS= read -r CHECK; do
             CONCLUSION=$(echo "$CHECK_RUNS" | jq -r --arg name "$CHECK" \
               'select(.name == $name) | .conclusion' | head -1)
             if [ "$CONCLUSION" != "success" ]; then
@@ -61,7 +64,7 @@ runs:
             else
               echo "PASS: required check '$CHECK' succeeded"
             fi
-          done
+          done < <(jq -r '.[]' <<< "$REQUIRED_CHECKS")
         else
           # Validate all non-skipped check-runs
           while IFS= read -r RUN; do

.github/actions/vscode/repackage-vsix-stable/action.yml

@@ -0,0 +1,72 @@
+name: "Repackage VSIX for Stable"
+description: >
+  Repackage a pre-release VSIX as a stable build by repacking its extension
+  contents with vsce.
+
+inputs:
+  source-vsix-path:
+    description: "Path to the source pre-release VSIX"
+    required: true
+  prerelease-version:
+    description: "Current pre-release version, used for logging"
+    required: true
+  stable-version:
+    description: "Stable version to stamp into the repackaged VSIX"
+    required: true
+  output-dir:
+    description: "Directory for the repackaged VSIX"
+    required: false
+    default: "./vsix-artifacts"
+
+outputs:
+  vsix-path:
+    description: "Path to the repackaged stable VSIX"
+    value: ${{ steps.repack.outputs.vsix-path }}
+
+runs:
+  using: composite
+  steps:
+    - name: Repackage VSIX with stable version
+      id: repack
+      shell: bash
+      env:
+        SOURCE_VSIX: ${{ inputs.source-vsix-path }}
+        PRERELEASE_VERSION: ${{ inputs.prerelease-version }}
+        STABLE_VERSION: ${{ inputs.stable-version }}
+        OUTPUT_DIR: ${{ inputs.output-dir }}
+      run: |
+        set -euo pipefail
+        echo "Repackaging VSIX via vsce: $PRERELEASE_VERSION -> $STABLE_VERSION"
+
+        if [ ! -f "$SOURCE_VSIX" ]; then
+          echo "::error::Source VSIX not found: $SOURCE_VSIX"
+          exit 1
+        fi
+
+        WORK_DIR="./vsix-repack"
+        rm -rf "$WORK_DIR"
+        mkdir -p "$WORK_DIR" "$OUTPUT_DIR"
+        unzip -q "$SOURCE_VSIX" -d "$WORK_DIR"
+
+        PKG_JSON="$WORK_DIR/extension/package.json"
+        if [ ! -f "$PKG_JSON" ]; then
+          echo "::error::extension/package.json not found in VSIX"
+          exit 1
+        fi
+
+        node -e "
+          const fs = require('fs');
+          const pkg = JSON.parse(fs.readFileSync('$PKG_JSON', 'utf8'));
+          pkg.version = '$STABLE_VERSION';
+          delete pkg.preRelease;
+          fs.writeFileSync('$PKG_JSON', JSON.stringify(pkg, null, 2) + '\\n');
+        "
+
+        OUT_ABS="$(cd "$OUTPUT_DIR" && pwd)/apex-language-server-extension-${STABLE_VERSION}.vsix"
+        (
+          cd "$WORK_DIR/extension"
+          npx --yes @vscode/vsce@3 package --no-dependencies --out "$OUT_ABS"
+        )
+
+        echo "Created stable VSIX: $OUT_ABS"
+        echo "vsix-path=$OUT_ABS" >> "$GITHUB_OUTPUT"

.github/workflows/automerge.yml

@@ -20,6 +20,21 @@ on:
         description: Optionally skip ci builds on merges into main
         type: boolean
         default: false
+      package-manager:
+        required: false
+        description: Package manager used by the calling repository (npm, pnpm, or yarn)
+        type: string
+        default: npm
+      package-manager-version:
+        required: false
+        description: pnpm version to use when package-manager is pnpm
+        type: string
+        default: '10'
+      cache-dependency-path:
+        required: false
+        description: Path to the calling repository's package manager lockfile
+        type: string
+        default: package-lock.json
 
 jobs:
   dependabot-automerge:
@@ -29,10 +44,17 @@ jobs:
         with:
           token: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
 
+      - name: Setup pnpm
+        if: inputs.package-manager == 'pnpm'
+        uses: pnpm/action-setup@v4
+        with:
+          version: ${{ inputs.package-manager-version }}
+
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-          cache: npm
+          cache: ${{ inputs.package-manager }}
+          cache-dependency-path: ${{ inputs.cache-dependency-path }}
 
       - run: npm install -g @salesforce/plugin-release-management --omit=dev
 

.github/workflows/ctcClose.yml

@@ -15,18 +15,39 @@ on:
         type: string
         default: lts/*
         required: false
+      package-manager:
+        description: Package manager used by the calling repository (npm, pnpm, or yarn)
+        type: string
+        default: npm
+        required: false
+      package-manager-version:
+        description: pnpm version to use when package-manager is pnpm
+        type: string
+        default: '10'
+        required: false
+      cache-dependency-path:
+        description: Path to the calling repository's package manager lockfile
+        type: string
+        default: package-lock.json
+        required: false
 
 jobs:
   ctcClose:
     runs-on: static-ip-ubuntu-24-runners
     steps:
       - uses: actions/checkout@v4
 
+      - name: Setup pnpm
+        if: inputs.package-manager == 'pnpm'
+        uses: pnpm/action-setup@v4
+        with:
+          version: ${{ inputs.package-manager-version }}
+
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ inputs.nodeVersion }}
-          # No `cache: npm`: it requires an npm lockfile and so hard-fails on
-          # pnpm/yarn consumer repos; the CTC CLI below is a one-off global install.
+          cache: ${{ inputs.package-manager }}
+          cache-dependency-path: ${{ inputs.cache-dependency-path }}
       - run: npm install -g @salesforce/change-case-management --omit=dev
       - id: ctc
         run: |

.github/workflows/ctcOpen.yml

@@ -9,6 +9,21 @@ on:
         type: string
         default: lts/*
         required: false
+      package-manager:
+        description: Package manager used by the calling repository (npm, pnpm, or yarn)
+        type: string
+        default: npm
+        required: false
+      package-manager-version:
+        description: pnpm version to use when package-manager is pnpm
+        type: string
+        default: '10'
+        required: false
+      cache-dependency-path:
+        description: Path to the calling repository's package manager lockfile
+        type: string
+        default: package-lock.json
+        required: false
     outputs:
       changeCaseId:
         description: Id for the change case created
@@ -22,11 +37,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Setup pnpm
+        if: inputs.package-manager == 'pnpm'
+        uses: pnpm/action-setup@v4
+        with:
+          version: ${{ inputs.package-manager-version }}
+
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ inputs.nodeVersion }}
-          # No `cache: npm`: it requires an npm lockfile and so hard-fails on
-          # pnpm/yarn consumer repos; the CTC CLI below is a one-off global install.
+          cache: ${{ inputs.package-manager }}
+          cache-dependency-path: ${{ inputs.cache-dependency-path }}
 
       - run: npm install -g @salesforce/change-case-management --omit=dev