From 6eab3afa278711068b7ec13c79863bcc659253b8 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Tue, 11 Jun 2024 14:57:31 -0500 Subject: [PATCH 1/2] chore: update github actions [no ci] --- .github/workflows/create-cli-release.yml | 8 ++++---- .github/workflows/create-github-release.yml | 12 ++++++------ .github/workflows/get-signed-from-stampy.yml | 2 +- .github/workflows/make-pr-for-nightly.yml | 6 +++--- .github/workflows/promote-nightly-to-rc.yml | 2 +- .github/workflows/promote-rc-to-latest.yml | 2 +- .github/workflows/workflow-failure.yml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/create-cli-release.yml b/.github/workflows/create-cli-release.yml index 2057fff5..01cf4776 100644 --- a/.github/workflows/create-cli-release.yml +++ b/.github/workflows/create-cli-release.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Get release channel Github release id: release-channel - uses: actions-ecosystem/action-regex-match@d50fd2e7a37d0e617aea3d7ada663bd56862b9cc + uses: kaisugi/action-regex-match@45cc5bacf016a4c0d2c3c9d0f8b7c2f1b79687b8 with: text: ${{ github.event.release.body }} # https://regex101.com/r/tYAJ8L/1 @@ -21,14 +21,14 @@ jobs: - name: Confirm regex channel match if: ${{ !steps.release-channel.outputs.group1 }} - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Release channel was not found in release body. Exiting') - name: Prevent legacy channel if: ${{ steps.release-channel.outputs.group1 == 'legacy' }} - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Do not publish to the "legacy" channel! It is still bundled with "sfdx@v7", which is permanetly archived.') @@ -150,7 +150,7 @@ jobs: - build-docker-full steps: - name: Announce patch in Slack - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.26.0 env: SLACK_WEBHOOK_URL: ${{ secrets.PLATFORM_CLI_CHANNEL_SLACK_INCOMING_WEBHOOK }} SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK diff --git a/.github/workflows/create-github-release.yml b/.github/workflows/create-github-release.yml index e9ac4c8d..0a516cb7 100644 --- a/.github/workflows/create-github-release.yml +++ b/.github/workflows/create-github-release.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Get release channel from PR title id: release-channel - uses: actions-ecosystem/action-regex-match@d50fd2e7a37d0e617aea3d7ada663bd56862b9cc + uses: kaisugi/action-regex-match@45cc5bacf016a4c0d2c3c9d0f8b7c2f1b79687b8 with: text: ${{ github.event.pull_request.title }} # https://regex101.com/r/66VrAs/1 @@ -30,14 +30,14 @@ jobs: # Exit the build if no channel is found - name: Confirm regex channel match if: ${{ !steps.release-channel.outputs.group1 }} - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Release channel was not found in PR title. Exiting') - name: Prevent legacy channel if: ${{ steps.release-channel.outputs.group1 == 'legacy' }} - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Do not publish to the "legacy" channel! It is still bundled with "sfdx@v7", which is permanetly archived.') @@ -56,7 +56,7 @@ jobs: # Package.json "alpha" tag must match PR title channel - name: Validate prerelease tag if: ${{ !contains(fromJSON('["latest", "latest-rc", "nightly"]'), steps.release-channel.outputs.group1) && (!steps.check-prerelease.outputs.tag || steps.check-prerelease.outputs.tag != steps.release-channel.outputs.group1) }} - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Prerelease requires a dist tag name in your package.json like beta in 1.1.1-beta.0') @@ -75,13 +75,13 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v4 - - uses: notiz-dev/github-action-json-property@7a701887f4b568b23eb7b78bb0fc49aaeb1b68d3 + - uses: salesforcecli/github-workflows/.github/actions/get-json-property@main id: packageVersion with: path: 'package.json' prop_path: 'version' - name: Create Github Release - uses: ncipollo/release-action@6c75be85e571768fa31b40abf38de58ba0397db5 + uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 with: name: ${{ steps.packageVersion.outputs.prop }} tag: ${{ steps.packageVersion.outputs.prop }} diff --git a/.github/workflows/get-signed-from-stampy.yml b/.github/workflows/get-signed-from-stampy.yml index 50d69736..4c8a4e66 100644 --- a/.github/workflows/get-signed-from-stampy.yml +++ b/.github/workflows/get-signed-from-stampy.yml @@ -65,7 +65,7 @@ jobs: node scripts/stampy-signed-delete.js - name: notify - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.26.0 env: SLACK_WEBHOOK_URL: ${{ secrets.CLI_TEAM_SLACK_WEBHOOK_URL }} SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK diff --git a/.github/workflows/make-pr-for-nightly.yml b/.github/workflows/make-pr-for-nightly.yml index 47b46700..488bba18 100644 --- a/.github/workflows/make-pr-for-nightly.yml +++ b/.github/workflows/make-pr-for-nightly.yml @@ -41,20 +41,20 @@ jobs: npmPackage: '@salesforce/cli' - name: Parse latest-rc semver - uses: booxmedialtd/ws-action-parse-semver@7784200024d6b3fc01253e617ec0168daf603de3 + uses: salesforcecli/github-workflows/.github/actions/parse-semver@main id: latest-rc-semver-info with: input_string: ${{ steps.latest-rc-version.outputs.version }} - name: Look up sf package.json version - uses: notiz-dev/github-action-json-property@7a701887f4b568b23eb7b78bb0fc49aaeb1b68d3 + uses: salesforcecli/github-workflows/.github/actions/get-json-property@main id: package-json-version with: path: 'package.json' prop_path: 'version' - name: Parse package.json semver - uses: booxmedialtd/ws-action-parse-semver@7784200024d6b3fc01253e617ec0168daf603de3 + uses: salesforcecli/github-workflows/.github/actions/parse-semver@main id: package-json-semver-info with: input_string: ${{ steps.package-json-version.outputs.prop }} diff --git a/.github/workflows/promote-nightly-to-rc.yml b/.github/workflows/promote-nightly-to-rc.yml index 17838d96..5b6510c9 100644 --- a/.github/workflows/promote-nightly-to-rc.yml +++ b/.github/workflows/promote-nightly-to-rc.yml @@ -95,7 +95,7 @@ jobs: - name: Announce promotion id: slack - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.26.0 env: SLACK_WEBHOOK_URL: ${{ secrets.PLATFORM_CLI_CHANNEL_SLACK_INCOMING_WEBHOOK }} SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK diff --git a/.github/workflows/promote-rc-to-latest.yml b/.github/workflows/promote-rc-to-latest.yml index 525b95cf..7a2f3e22 100644 --- a/.github/workflows/promote-rc-to-latest.yml +++ b/.github/workflows/promote-rc-to-latest.yml @@ -93,7 +93,7 @@ jobs: - name: Announce promotion id: slack - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.26.0 env: SLACK_WEBHOOK_URL: ${{ secrets.PLATFORM_CLI_CHANNEL_SLACK_INCOMING_WEBHOOK }} SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK diff --git a/.github/workflows/workflow-failure.yml b/.github/workflows/workflow-failure.yml index 387b2b2e..7e6b48d0 100644 --- a/.github/workflows/workflow-failure.yml +++ b/.github/workflows/workflow-failure.yml @@ -40,7 +40,7 @@ jobs: steps: - name: Announce Failure id: slack - uses: slackapi/slack-github-action@v1.24.0 + uses: slackapi/slack-github-action@v1.26.0 env: SLACK_WEBHOOK_URL: ${{ secrets.CLI_ALERTS_SLACK_WEBHOOK }} SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK From 905c7693f31370e07b500f064d4c211fb848494b Mon Sep 17 00:00:00 2001 From: Eric Willhoit Date: Wed, 12 Jun 2024 11:05:09 -0500 Subject: [PATCH 2/2] chore: docker actions --- .github/workflows/build-docker-full.yml | 6 +++--- .github/workflows/build-docker-slim.yml | 8 ++++---- .github/workflows/promote.yml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-docker-full.yml b/.github/workflows/build-docker-full.yml index 3e92abb7..308f4309 100644 --- a/.github/workflows/build-docker-full.yml +++ b/.github/workflows/build-docker-full.yml @@ -24,14 +24,14 @@ jobs: node-version: ${{ vars.NODE_VERSION_OVERRIDE || 'lts/*' }} - name: Log in to Docker Hub - uses: docker/login-action@40891eba8c2bcd1309b07ba8b11232f313e86779 + uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 with: images: salesforce/cli @@ -49,7 +49,7 @@ jobs: echo "sha=$SHA" >> "$GITHUB_OUTPUT" - name: Build and push Docker image - uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 + uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 with: context: . push: true diff --git a/.github/workflows/build-docker-slim.yml b/.github/workflows/build-docker-slim.yml index e3ef4bf5..4d90e4db 100644 --- a/.github/workflows/build-docker-slim.yml +++ b/.github/workflows/build-docker-slim.yml @@ -32,22 +32,22 @@ jobs: npmPackage: '@salesforce/cli' - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb - name: Log in to Docker Hub - uses: docker/login-action@40891eba8c2bcd1309b07ba8b11232f313e86779 + uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 with: images: salesforce/cli - name: Build and push Docker image - uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 + uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 with: context: . push: true diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml index 444a609a..e1682f24 100644 --- a/.github/workflows/promote.yml +++ b/.github/workflows/promote.yml @@ -125,10 +125,10 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb - name: Log in to Docker Hub - uses: docker/login-action@40891eba8c2bcd1309b07ba8b11232f313e86779 + uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }}