diff --git a/.github/workflows/bump-cli-version.yml b/.github/workflows/bump-cli-version.yml index 91e07a0..a775cff 100644 --- a/.github/workflows/bump-cli-version.yml +++ b/.github/workflows/bump-cli-version.yml @@ -33,5 +33,6 @@ jobs: with: version: ${{ github.event.client_payload.version || inputs.version }} bump-command: bash scripts/bump-cli-version.sh "$VERSION" + merge: "true" token: ${{ secrets.DOWNSTREAM_RELEASE_PUSH_TOKEN }} ssh-signing-key: ${{ secrets.CLOUDSMITH_BOT_SSH_KEY }} diff --git a/CONTRIBUTION.md b/CONTRIBUTION.md index 18e484a..e37165c 100644 --- a/CONTRIBUTION.md +++ b/CONTRIBUTION.md @@ -44,7 +44,8 @@ repository. The `Bump Cloudsmith CLI` workflow then runs The script pins the default `cli-version` in `action.yml` to the new CLI version. It also adds a patch version section to `CHANGELOG.md`. If `[Unreleased]` has entries, the script adds a minor version section that -includes them. Merge the pull request to release it. +includes them. The workflow squash-merges the pull request when the checks +pass, and the merge releases the action. To pin a CLI version by hand, run the `Bump Cloudsmith CLI` workflow with that version. To see the change locally, run `bash scripts/bump-cli-version.sh