From 0266997fa55079ee1d8734cb82445831acb236ba Mon Sep 17 00:00:00 2001
From: Eric Willhoit <ewillhoit@salesforce.com>
Date: Thu, 1 Aug 2024 14:18:12 -0500
Subject: [PATCH 1/7] chore: remove deprecated inputs

---
 .github/workflows/create-cli-release.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/create-cli-release.yml b/.github/workflows/create-cli-release.yml
index 01cf4776..47819955 100644
--- a/.github/workflows/create-cli-release.yml
+++ b/.github/workflows/create-cli-release.yml
@@ -59,7 +59,6 @@ jobs:
     uses: salesforcecli/github-workflows/.github/workflows/tarballs.yml@main
     with:
       upload: true
-      cli: sf
       version: ${{ github.event.release.tag_name }}
       channel: ${{ needs.get-channel.outputs.s3-channel }}
       nodeVersion: ${{ vars.NODE_VERSION_OVERRIDE || 'lts/*' }}
@@ -94,7 +93,6 @@ jobs:
     needs: [get-channel, pack-verify-upload-tarballs]
     uses: salesforcecli/github-workflows/.github/workflows/packUploadMac.yml@main
     with:
-      cli: sf
       version: ${{ github.event.release.tag_name }}
       channel: ${{ needs.get-channel.outputs.s3-channel }}
       nodeVersion: ${{ vars.NODE_VERSION_OVERRIDE || 'lts/*' }}
@@ -104,7 +102,6 @@ jobs:
     needs: [get-channel, pack-verify-upload-tarballs]
     uses: salesforcecli/github-workflows/.github/workflows/packUploadWindows.yml@main
     with:
-      cli: sf
       version: ${{ github.event.release.tag_name }}
       channel: ${{ needs.get-channel.outputs.s3-channel }}
       nodeVersion: ${{ vars.NODE_VERSION_OVERRIDE || 'lts/*' }}
@@ -116,8 +113,6 @@ jobs:
     secrets: inherit
     with:
       version: ${{ github.event.release.tag_name }}
-      cli: sf
-      clipkg: '@salesforce/cli'
 
   build-docker-slim:
     needs: [get-channel, pack-verify-upload-tarballs]

From e5ef45310b156ecbd9874f2a7e50b1dd9f4f4d21 Mon Sep 17 00:00:00 2001
From: Eric Willhoit <ewillhoit@salesforce.com>
Date: Thu, 1 Aug 2024 17:02:06 -0500
Subject: [PATCH 2/7] chore: moving inputs

---
 .github/workflows/build-docker-full.yml  |  4 +++-
 .github/workflows/create-cli-release.yml | 17 +++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-docker-full.yml b/.github/workflows/build-docker-full.yml
index 308f4309..7bb115ee 100644
--- a/.github/workflows/build-docker-full.yml
+++ b/.github/workflows/build-docker-full.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Collect Node checksum
         id: node-checksum
         run: |
-          NODE_VERSION="${{ steps.setup-node.outputs.node-version }}"
+          NODE_VERSION="$STEPS_SETUP_NODE_NODE_VERSION"
 
           URL="https://nodejs.org/dist/$NODE_VERSION/SHASUMS256.txt"
           echo "Retrieving SHA data from: $URL"
@@ -47,6 +47,8 @@ jobs:
           echo "Checksum found: $SHA"
 
           echo "sha=$SHA" >> "$GITHUB_OUTPUT"
+        env:
+          STEPS_SETUP_NODE_NODE_VERSION: ${{ steps.setup-node.outputs.node-version }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25
diff --git a/.github/workflows/create-cli-release.yml b/.github/workflows/create-cli-release.yml
index 47819955..3c01f9f8 100644
--- a/.github/workflows/create-cli-release.yml
+++ b/.github/workflows/create-cli-release.yml
@@ -36,14 +36,19 @@ jobs:
       - name: Get release channel for s3
         id: s3-release-channel
         run: |
-          CHANNEL=${{ steps.release-channel.outputs.group1 }}
+          CHANNEL="$STEPS_RELEASE_CHANNEL_GROUP1"
           S3_CHANNEL=${CHANNEL/latest/stable}
           echo "s3-channel=$S3_CHANNEL" >> "$GITHUB_OUTPUT"
+        env:
+          STEPS_RELEASE_CHANNEL_GROUP1: ${{ steps.release-channel.outputs.group1 }}
 
       - name: Channel Notice
         run: |
-          echo "::notice title=Channel::Channel found in Github Release: ${{ steps.release-channel.outputs.group1 }}"
-          echo "::notice title=S3 Channel::Channel that will be used in S3: ${{ steps.s3-release-channel.outputs.s3-channel }}"
+          echo "::notice title=Channel::Channel found in Github Release: $STEPS_RELEASE_CHANNEL_GROUP1"
+          echo "::notice title=S3 Channel::Channel that will be used in S3: $STEPS_S3_RELEASE_CHANNEL_S3_CHANNEL"
+        env:
+          STEPS_RELEASE_CHANNEL_GROUP1: ${{ steps.release-channel.outputs.group1 }}
+          STEPS_S3_RELEASE_CHANNEL_S3_CHANNEL: ${{ steps.s3-release-channel.outputs.s3-channel }}
 
   npm-release:
     uses: salesforcecli/github-workflows/.github/workflows/npmPublish.yml@main
@@ -146,9 +151,6 @@ jobs:
     steps:
       - name: Announce patch in Slack
         uses: slackapi/slack-github-action@v1.26.0
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.PLATFORM_CLI_CHANNEL_SLACK_INCOMING_WEBHOOK }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
         with:
           payload: |
             {
@@ -160,6 +162,9 @@ jobs:
                 }
               }]
             }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.PLATFORM_CLI_CHANNEL_SLACK_INCOMING_WEBHOOK }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
 
   run-just-nuts:
     needs:

From 0682b148cdedbfb80c58706e0a5cca854d7971dd Mon Sep 17 00:00:00 2001
From: Eric Willhoit <ewillhoit@salesforce.com>
Date: Fri, 2 Aug 2024 10:04:27 -0500
Subject: [PATCH 3/7] chore: promote refactor

---
 .github/workflows/promote-nightly-to-rc.yml | 15 +++++--
 .github/workflows/promote-rc-to-latest.yml  | 15 +++++--
 .github/workflows/promote.yml               | 46 ++++++++++++++++-----
 3 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/promote-nightly-to-rc.yml b/.github/workflows/promote-nightly-to-rc.yml
index 5b6510c9..c89df26a 100644
--- a/.github/workflows/promote-nightly-to-rc.yml
+++ b/.github/workflows/promote-nightly-to-rc.yml
@@ -59,29 +59,36 @@ jobs:
         run: |
           VERSION=$(npm view @salesforce/cli@latest-rc --json | jq -r '.version')
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
       - name: Get docker-full CLI version
         id: docker-full-version
         run: |
           docker pull salesforce/cli:latest-rc-full
           VERSION=$(docker run --rm salesforce/cli:latest-rc-full sf version --json | jq -r '.cliVersion' | cut -d'/' -f 3)
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
       - name: Get docker-slim CLI version
         id: docker-slim-version
         run: |
           docker pull salesforce/cli:latest-rc-slim
           VERSION=$(docker run --rm salesforce/cli:latest-rc-slim sf version --json | jq -r '.cliVersion' | cut -d'/' -f 3)
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
       - name: Compare Docker versions against npm
         run: |
-          echo "NPM latest-rc version is: ${{ steps.latest-rc-version.outputs.version }}"
-          echo "Docker-full version is: ${{ steps.docker-full-version.outputs.version }}"
-          echo "Docker-slim version is: ${{ steps.docker-slim-version.outputs.version }}"
-          if [ "${{ steps.latest-rc-version.outputs.version }}" == "${{ steps.docker-full-version.outputs.version }}" ] && [ "${{ steps.docker-full-version.outputs.version }}" == "${{ steps.docker-slim-version.outputs.version }}" ]; then
+          echo "[INFO] NPM latest-rc version is: $STEPS_LATEST_RC_VERSION_VERSION"
+          echo "[INFO] Docker-full version is: $STEPS_DOCKER_FULL_VERSION_VERSION"
+          echo "[INFO] Docker-slim version is: $STEPS_DOCKER_SLIM_VERSION_VERSION"
+          if [ "$STEPS_LATEST_RC_VERSION_VERSION" == "$STEPS_DOCKER_FULL_VERSION_VERSION" ] && [ "$STEPS_DOCKER_FULL_VERSION_VERSION" == "$STEPS_DOCKER_SLIM_VERSION_VERSION" ]; then
             echo "Docker versions match npm version. Proceeding..."
           else
             echo "Version mismatch! Exiting..."
             exit 1
           fi
+        env:
+          STEPS_LATEST_RC_VERSION_VERSION: ${{ steps.latest-rc-version.outputs.version }}
+          STEPS_DOCKER_FULL_VERSION_VERSION: ${{ steps.docker-full-version.outputs.version }}
+          STEPS_DOCKER_SLIM_VERSION_VERSION: ${{ steps.docker-slim-version.outputs.version }}
 
   announce-promotion-to-slack:
     needs: [promote-verify, verify-docker-version]
diff --git a/.github/workflows/promote-rc-to-latest.yml b/.github/workflows/promote-rc-to-latest.yml
index 7a2f3e22..265b3a7c 100644
--- a/.github/workflows/promote-rc-to-latest.yml
+++ b/.github/workflows/promote-rc-to-latest.yml
@@ -57,29 +57,36 @@ jobs:
         run: |
           VERSION=$(npm view @salesforce/cli@latest --json | jq -r '.version')
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
       - name: Get docker-full CLI version
         id: docker-full-version
         run: |
           docker pull salesforce/cli:latest-full
           VERSION=$(docker run --rm salesforce/cli:latest-full sf version --json | jq -r '.cliVersion' | cut -d'/' -f 3)
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
       - name: Get docker-slim CLI version
         id: docker-slim-version
         run: |
           docker pull salesforce/cli:latest-slim
           VERSION=$(docker run --rm salesforce/cli:latest-slim sf version --json | jq -r '.cliVersion' | cut -d'/' -f 3)
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
       - name: Compare Docker versions against npm
         run: |
-          echo "NPM latest version is: ${{ steps.latest-version.outputs.version }}"
-          echo "Docker-full version is: ${{ steps.docker-full-version.outputs.version }}"
-          echo "Docker-slim version is: ${{ steps.docker-slim-version.outputs.version }}"
-          if [ "${{ steps.latest-version.outputs.version }}" == "${{ steps.docker-full-version.outputs.version }}" ] && [ "${{ steps.docker-full-version.outputs.version }}" == "${{ steps.docker-slim-version.outputs.version }}" ]; then
+          echo "[INFO] NPM latest version is: $STEPS_LAST_VERSION_VERSION"
+          echo "[INFO] Docker-full version is: $STEPS_DOCKER_FULL_VERSION_VERSION"
+          echo "[INFO] Docker-slim version is: $STEPS_DOCKER_SLIM_VERSION_VERSION"
+          if [ "$STEPS_LAST_VERSION_VERSION" == "$STEPS_DOCKER_FULL_VERSION_VERSION" ] && [ "$STEPS_DOCKER_FULL_VERSION_VERSION" == "$STEPS_DOCKER_SLIM_VERSION_VERSION" ]; then
             echo "Docker versions match npm version. Proceeding..."
           else
             echo "Version mismatch! Exiting..."
             exit 1
           fi
+        env:
+          STEPS_LAST_VERSION_VERSION: ${{ steps.latest-version.outputs.version }}
+          STEPS_DOCKER_FULL_VERSION_VERSION: ${{ steps.docker-full-version.outputs.version }}
+          STEPS_DOCKER_SLIM_VERSION_VERSION: ${{ steps.docker-slim-version.outputs.version }}
 
   announce-promotion-to-slack:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml
index e1682f24..60876cdc 100644
--- a/.github/workflows/promote.yml
+++ b/.github/workflows/promote.yml
@@ -82,9 +82,11 @@ jobs:
     steps:
       - id: replace-channel
         run: |
-          NEW_CHANNEL=${{ inputs.new-channel }}
+          NEW_CHANNEL="$INPUTS_NEW_CHANNEL"
           S3_NEW_CHANNEL=${NEW_CHANNEL/latest/stable}
           echo "s3-new-channel=$S3_NEW_CHANNEL" >> "$GITHUB_OUTPUT"
+        env:
+          INPUTS_NEW_CHANNEL: ${{ inputs.new-channel }}
 
   # CTC is only needed for promotions to 'latest'
   # Note: "Optional" GHA jobs are tricky to get right. Edit with caution.
@@ -104,6 +106,7 @@ jobs:
           SF_CHANGE_CASE_TEMPLATE_ID: ${{ secrets.SF_CHANGE_CASE_TEMPLATE_ID}}
           SF_CHANGE_CASE_CONFIGURATION_ITEM: ${{ secrets.SF_CHANGE_CASE_CONFIGURATION_ITEM}}
           SVC_CLI_BOT_GITHUB_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN}}
+
       - name: Check open-ctc status
         if: always()
         run: |
@@ -133,14 +136,18 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - run: |
-          docker pull salesforce/cli:${{ needs.get-package-info.outputs.version }}-slim
-          docker tag salesforce/cli:${{ needs.get-package-info.outputs.version }}-slim salesforce/cli:${{ inputs.new-channel }}-slim
-          docker push salesforce/cli:${{ inputs.new-channel }}-slim
+      - name: Promote Docker images
+        run: |
+          docker pull "salesforce/cli:$NEEDS_GET_PACKAGE_INFO_VERSION-slim"
+          docker tag "salesforce/cli:$NEEDS_GET_PACKAGE_INFO_VERSION-slim salesforce/cli:$INPUTS_NEW_CHANNEL-slim"
+          docker push "salesforce/cli:$INPUTS_NEW_CHANNEL-slim"
 
-          docker pull salesforce/cli:${{ needs.get-package-info.outputs.version }}-full
-          docker tag salesforce/cli:${{ needs.get-package-info.outputs.version }}-full salesforce/cli:${{ inputs.new-channel }}-full
-          docker push salesforce/cli:${{ inputs.new-channel }}-full
+          docker pull "salesforce/cli:$NEEDS_GET_PACKAGE_INFO_VERSION-full"
+          docker tag "salesforce/cli:$NEEDS_GET_PACKAGE_INFO_VERSION-full salesforce/cli:$INPUTS_NEW_CHANNEL-full"
+          docker push "salesforce/cli:$INPUTS_NEW_CHANNEL-full"
+        env:
+          NEEDS_GET_PACKAGE_INFO_VERSION: ${{ needs.get-package-info.outputs.version }}
+          INPUTS_NEW_CHANNEL: ${{ inputs.new-channel }}
 
   npm-promote:
     needs: [open-ctc-or-skip, get-package-info]
@@ -153,7 +160,10 @@ jobs:
       # NOTE: If you try to use yarn here, it will use the wrong registry and throw 401s
       - run: |
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
-          npm dist-tag add @salesforce/cli@${{ needs.get-package-info.outputs.version }} ${{ inputs.new-channel }}
+          npm dist-tag add "@salesforce/cli@$NEEDS_GET_PACKAGE_INFO_VERSION" "$INPUTS_NEW_CHANNEL"
+        env:
+          NEEDS_GET_PACKAGE_INFO_VERSION: ${{ needs.get-package-info.outputs.version }}
+          INPUTS_NEW_CHANNEL: ${{ inputs.new-channel }}
 
   oclif-promote:
     needs: [open-ctc-or-skip, get-package-info, build-s3-channel]
@@ -161,13 +171,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ vars.NODE_VERSION_OVERRIDE || 'lts/*' }}
           cache: yarn
-      - run: yarn install
-      - run: yarn promote --version ${{ needs.get-package-info.outputs.version }} --sha ${{ needs.get-package-info.outputs.sha }} --channel ${{ needs.build-s3-channel.outputs.s3-new-channel }} --max-age 300 --macos --win --indexes --xz
+
+      - uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@main
+
+      - name: Promote with oclif
+        run: yarn promote --version "$NEEDS_GET_PACKAGE_INFO_VERSION" \
+          --sha "$NEEDS_GET_PACKAGE_INFO_SHA" \
+          --channel "$NEEDS_BUILD_S3_CHANNEL_S3_NEW_CHANNEL" \
+          --max-age 300 \
+          --macos \
+          --win \
+          --indexes \
+          --xz
         env:
+          NEEDS_GET_PACKAGE_INFO_VERSION: ${{ needs.get-package-info.outputs.version }}
+          NEEDS_GET_PACKAGE_INFO_SHA: ${{ needs.get-package-info.outputs.sha }}
+          NEEDS_BUILD_S3_CHANNEL_S3_NEW_CHANNEL: ${{ needs.build-s3-channel.outputs.s3-new-channel }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           DEBUG: ${{ vars.DEBUG }}

From 19c4c868b7e67a45cfa0b43a94c80bc09e3a979f Mon Sep 17 00:00:00 2001
From: Eric Willhoit <ewillhoit@salesforce.com>
Date: Fri, 2 Aug 2024 10:22:16 -0500
Subject: [PATCH 4/7] chore: more cleanup

---
 .github/workflows/get-signed-from-stampy.yml | 26 ++++++++++----------
 .github/workflows/jit-install-smoke.yml      |  3 ++-
 .github/workflows/just-nut.yml               |  2 --
 .github/workflows/just-nuts.yml              | 20 +++++++--------
 .github/workflows/make-pr-for-nightly.yml    | 16 +++++++-----
 .github/workflows/make-pr-for-release.yml    |  5 ++--
 .github/workflows/promote.yml                | 10 ++++----
 7 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/get-signed-from-stampy.yml b/.github/workflows/get-signed-from-stampy.yml
index 4c8a4e66..564c351c 100644
--- a/.github/workflows/get-signed-from-stampy.yml
+++ b/.github/workflows/get-signed-from-stampy.yml
@@ -13,11 +13,6 @@ jobs:
         uses: actions/checkout@v4
 
       - name: download
-        env:
-          STAMPY_ARN: ${{ secrets.STAMPY_ARN }}
-          AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
-          AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
-          AWS_EC2_METADATA_DISABLED: true
         # switch AWS identity to the one that can access stampy
         run: |
           ACCOUNT_ID=$(aws sts get-caller-identity | jq -r '.Account')
@@ -26,13 +21,14 @@ jobs:
           export AWS_SECRET_ACCESS_KEY=$(echo "${TEMP_ROLE}" | jq -r '.Credentials.SecretAccessKey')
           export AWS_SESSION_TOKEN=$(echo "${TEMP_ROLE}" | jq -r '.Credentials.SessionToken')
           aws s3 cp --recursive ${{ secrets.STAMPY_SIGNED_BUCKET }}/ .
-
-      - name: upload to CLI s3
-        id: upload
         env:
+          STAMPY_ARN: ${{ secrets.STAMPY_ARN }}
           AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
           AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
           AWS_EC2_METADATA_DISABLED: true
+
+      - name: upload to CLI s3
+        id: upload
         run: |
           # Run script and redirect stderr to stdout
           OUTPUT=$(node scripts/stampy-signed-upload.js 2>&1)
@@ -47,15 +43,12 @@ jobs:
           # Set multiline string output
           # https://stackoverflow.com/questions/74137120/how-to-fix-or-avoid-error-unable-to-process-file-command-output-successfully#comment131739699_74232400
           echo -e "output<<EOF\n$OUTPUT\nEOF" >> "$GITHUB_OUTPUT"
-
-      - name: clean up stampy in/out buckets
         env:
-          STAMPY_ARN: ${{ secrets.STAMPY_ARN }}
-          STAMPY_UNSIGNED_BUCKET: ${{ secrets.STAMPY_UNSIGNED_BUCKET }}
-          STAMPY_SIGNED_BUCKET: ${{ secrets.STAMPY_SIGNED_BUCKET }}
           AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
           AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
           AWS_EC2_METADATA_DISABLED: true
+
+      - name: clean up stampy in/out buckets
         run: |
           ACCOUNT_ID=$(aws sts get-caller-identity | jq -r '.Account')
           TEMP_ROLE=$(aws sts assume-role --role-arn $STAMPY_ARN --role-session-name artifact-signing)
@@ -63,6 +56,13 @@ jobs:
           export AWS_SECRET_ACCESS_KEY=$(echo "${TEMP_ROLE}" | jq -r '.Credentials.SecretAccessKey')
           export AWS_SESSION_TOKEN=$(echo "${TEMP_ROLE}" | jq -r '.Credentials.SessionToken')
           node scripts/stampy-signed-delete.js
+        env:
+          STAMPY_ARN: ${{ secrets.STAMPY_ARN }}
+          STAMPY_UNSIGNED_BUCKET: ${{ secrets.STAMPY_UNSIGNED_BUCKET }}
+          STAMPY_SIGNED_BUCKET: ${{ secrets.STAMPY_SIGNED_BUCKET }}
+          AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
+          AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
+          AWS_EC2_METADATA_DISABLED: true
 
       - name: notify
         uses: slackapi/slack-github-action@v1.26.0
diff --git a/.github/workflows/jit-install-smoke.yml b/.github/workflows/jit-install-smoke.yml
index e909f617..b43d16e2 100644
--- a/.github/workflows/jit-install-smoke.yml
+++ b/.github/workflows/jit-install-smoke.yml
@@ -69,6 +69,7 @@ jobs:
       - name: Install JIT plugin
         uses: salesforcecli/github-workflows/.github/actions/retry@main
         with:
-          command: yarn sf-release cli:install:jit:test --jit-plugin ${{matrix.jitPlugins}}
+          command: yarn sf-release cli:install:jit:test --jit-plugin $MATRIX_JIT_PLUGINS
         env:
+          MATRIX_JIT_PLUGINS: ${{ matrix.jitPlugins }}
           SF_DISABLE_TELEMETRY: true
diff --git a/.github/workflows/just-nut.yml b/.github/workflows/just-nut.yml
index 8b0a72b6..0ac357d2 100644
--- a/.github/workflows/just-nut.yml
+++ b/.github/workflows/just-nut.yml
@@ -101,5 +101,3 @@ jobs:
         with:
           retry_wait_seconds: 1
           command: ${{ inputs.command }}
-          # TODO: any reason we dont retry on errors AND timeouts? (any)
-          retry_on: error
diff --git a/.github/workflows/just-nuts.yml b/.github/workflows/just-nuts.yml
index b45ad17c..043527ea 100644
--- a/.github/workflows/just-nuts.yml
+++ b/.github/workflows/just-nuts.yml
@@ -34,9 +34,9 @@ jobs:
           - salesforcecli/plugin-user
     uses: ./.github/workflows/just-nut.yml
     with:
-      repository: ${{matrix.repository}}
+      repository: ${{ matrix.repository }}
       channel-or-version: ${{ inputs.channel-or-version }}
-      os: ${{matrix.os}}
+      os: ${{ matrix.os }}
     secrets: inherit
 
   jit:
@@ -60,9 +60,9 @@ jobs:
             repository: salesforcecli/plugin-dev # These are flakey on Windows
     uses: ./.github/workflows/just-nut.yml
     with:
-      repository: ${{matrix.repository}}
+      repository: ${{ matrix.repository }}
       channel-or-version: ${{ inputs.channel-or-version }}
-      os: ${{matrix.os}}
+      os: ${{ matrix.os }}
       jit: true
     secrets: inherit
 
@@ -79,8 +79,8 @@ jobs:
     with:
       repository: salesforcecli/plugin-packaging
       channel-or-version: ${{ inputs.channel-or-version }}
-      os: ${{matrix.os}}
-      command: ${{matrix.command}}
+      os: ${{ matrix.os }}
+      command: ${{ matrix.command }}
     secrets: inherit
 
   source:
@@ -105,8 +105,8 @@ jobs:
     with:
       repository: salesforcecli/plugin-source
       channel-or-version: ${{ inputs.channel-or-version }}
-      os: ${{matrix.os}}
-      command: ${{matrix.command}}
+      os: ${{ matrix.os }}
+      command: ${{ matrix.command }}
     secrets: inherit
 
   deploy-retrieve:
@@ -133,6 +133,6 @@ jobs:
     with:
       repository: salesforcecli/plugin-deploy-retrieve
       channel-or-version: ${{ inputs.channel-or-version }}
-      os: ${{matrix.os}}
-      command: ${{matrix.command}}
+      os: ${{ matrix.os }}
+      command: ${{ matrix.command }}
     secrets: inherit
diff --git a/.github/workflows/make-pr-for-nightly.yml b/.github/workflows/make-pr-for-nightly.yml
index 488bba18..ac0ed7b2 100644
--- a/.github/workflows/make-pr-for-nightly.yml
+++ b/.github/workflows/make-pr-for-nightly.yml
@@ -20,7 +20,6 @@ jobs:
   make-pr-for-nightly:
     env:
       GITHUB_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }}
-      SF_HIDE_RELEASE_NOTES: true
     runs-on: 'ubuntu-latest'
     steps:
       - name: Check out repository as our bot user
@@ -60,12 +59,17 @@ jobs:
           input_string: ${{ steps.package-json-version.outputs.prop }}
 
       - name: Log version info
-        run: |
-          echo "INFO | Semver version in 'latest-rc' is ${{ steps.latest-rc-version.outputs.version }}"
-          echo "INFO | Semver minor in 'latest-rc' is ${{ steps.latest-rc-semver-info.outputs.minor }}"
-          echo "INFO | Semver version in 'main' is ${{ steps.package-json-version.outputs.prop  }}"
-          echo "INFO | Semver minor in 'main' is ${{ steps.package-json-semver-info.outputs.minor }}"
         shell: bash
+        run: |
+          echo "[INFO] Semver version in 'latest-rc' is: $STEPS_LATEST_RC_VERSION_VERSION"
+          echo "[INFO] Semver minor in 'latest-rc' is: $STEPS_LATEST_RC_SEMVER_INFO_MINOR"
+          echo "[INFO] Semver version in 'main' is: $STEPS_PACKAGE_JSON_VERSION_PROP"
+          echo "[INFO] Semver minor in 'main' is: $STEPS_PACKAGE_JSON_SEMVER_INFO_MINOR"
+        env:
+          STEPS_LATEST_RC_VERSION_VERSION: ${{ steps.latest-rc-version.outputs.version }}
+          STEPS_LATEST_RC_SEMVER_INFO_MINOR: ${{ steps.latest-rc-semver-info.outputs.minor }}
+          STEPS_PACKAGE_JSON_VERSION_PROP: ${{ steps.package-json-version.outputs.prop }}
+          STEPS_PACKAGE_JSON_SEMVER_INFO_MINOR: ${{ steps.package-json-semver-info.outputs.minor }}
 
       - name: Install @salesforce/plugin-release-management
         run: npm install -g @salesforce/plugin-release-management --omit=dev
diff --git a/.github/workflows/make-pr-for-release.yml b/.github/workflows/make-pr-for-release.yml
index 9676e58d..fb423151 100644
--- a/.github/workflows/make-pr-for-release.yml
+++ b/.github/workflows/make-pr-for-release.yml
@@ -41,7 +41,6 @@ jobs:
   make-pr:
     env:
       GITHUB_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }}
-      SF_HIDE_RELEASE_NOTES: true
     runs-on: 'ubuntu-latest'
     steps:
       - uses: actions/checkout@v4
@@ -68,7 +67,7 @@ jobs:
 
       - run: |
           sf-release cli:release:build \
-            --release-channel ${{ inputs.release-channel }} \
+            --release-channel "$INPUTS_RELEASE_CHANNEL" \
             ${{ inputs.pinned-deps && '--pinned-deps' || '--no-pinned-deps' }} \
             ${{ inputs.resolutions && '--resolutions' || '--no-resolutions' }} \
             ${{ inputs.jit && '--jit' || '--no-jit' }} \
@@ -77,3 +76,5 @@ jobs:
             ${{ inputs.patch && '--patch' || '' }} \
             ${{ inputs.only && format('--only {0}', inputs.only) || '' }} \
             ${{ inputs.empty && '--empty' || '' }}
+        env:
+          INPUTS_RELEASE_CHANNEL: ${{ inputs.release-channel }}
diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml
index 60876cdc..8e8fb7b0 100644
--- a/.github/workflows/promote.yml
+++ b/.github/workflows/promote.yml
@@ -102,10 +102,10 @@ jobs:
         if: inputs.use-ctc
         uses: salesforcecli/github-workflows/.github/actions/ctcOpen@main
         with:
-          SF_CHANGE_CASE_SFDX_AUTH_URL: ${{ secrets.SF_CHANGE_CASE_SFDX_AUTH_URL}}
-          SF_CHANGE_CASE_TEMPLATE_ID: ${{ secrets.SF_CHANGE_CASE_TEMPLATE_ID}}
-          SF_CHANGE_CASE_CONFIGURATION_ITEM: ${{ secrets.SF_CHANGE_CASE_CONFIGURATION_ITEM}}
-          SVC_CLI_BOT_GITHUB_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN}}
+          SF_CHANGE_CASE_SFDX_AUTH_URL: ${{ secrets.SF_CHANGE_CASE_SFDX_AUTH_URL }}
+          SF_CHANGE_CASE_TEMPLATE_ID: ${{ secrets.SF_CHANGE_CASE_TEMPLATE_ID }}
+          SF_CHANGE_CASE_CONFIGURATION_ITEM: ${{ secrets.SF_CHANGE_CASE_CONFIGURATION_ITEM }}
+          SVC_CLI_BOT_GITHUB_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }}
 
       - name: Check open-ctc status
         if: always()
@@ -202,7 +202,7 @@ jobs:
     uses: salesforcecli/github-workflows/.github/workflows/ctcClose.yml@main
     secrets: inherit
     with:
-      changeCaseId: ${{needs.open-ctc-or-skip.outputs.changeCaseId}}
+      changeCaseId: ${{ needs.open-ctc-or-skip.outputs.changeCaseId }}
 
   ctcCloseFail:
     needs: [open-ctc-or-skip, npm-promote, docker-promote, oclif-promote]

From 3768b7439b131e1b53d64ef27a47ff38c9739f91 Mon Sep 17 00:00:00 2001
From: Eric Willhoit <ewillhoit@salesforce.com>
Date: Fri, 2 Aug 2024 11:34:50 -0500
Subject: [PATCH 5/7] chore: revert

---
 .github/workflows/jit-install-smoke.yml | 3 +--
 .github/workflows/test.yml              | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/jit-install-smoke.yml b/.github/workflows/jit-install-smoke.yml
index b43d16e2..82460e11 100644
--- a/.github/workflows/jit-install-smoke.yml
+++ b/.github/workflows/jit-install-smoke.yml
@@ -69,7 +69,6 @@ jobs:
       - name: Install JIT plugin
         uses: salesforcecli/github-workflows/.github/actions/retry@main
         with:
-          command: yarn sf-release cli:install:jit:test --jit-plugin $MATRIX_JIT_PLUGINS
+          command: yarn sf-release cli:install:jit:test --jit-plugin ${{ matrix.jitPlugins }}
         env:
-          MATRIX_JIT_PLUGINS: ${{ matrix.jitPlugins }}
           SF_DISABLE_TELEMETRY: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a28d8a0b..bd1023a2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,6 @@ jobs:
       nodeVersion: ${{ vars.NODE_VERSION_OVERRIDE || 'lts/*' }}
     secrets: inherit
 
-  # DONE
   jit-install-smoke:
     uses: ./.github/workflows/jit-install-smoke.yml
     secrets: inherit

From 8502dbc19607574a0e3237155437fe63c6223a58 Mon Sep 17 00:00:00 2001
From: Eric Willhoit <ewillhoit@salesforce.com>
Date: Tue, 27 Aug 2024 09:40:14 -0500
Subject: [PATCH 6/7] test: empty commit


From 7dee702c5c7045623fc0fca0976a90d6a757499e Mon Sep 17 00:00:00 2001
From: Eric Willhoit <ewillhoit@salesforce.com>
Date: Tue, 27 Aug 2024 09:47:24 -0500
Subject: [PATCH 7/7] test: empty commit