diff --git a/.github/scripts/release-pr-template.ejs b/.github/scripts/release-pr-template.ejs index 40ad4438..aefae9a8 100644 --- a/.github/scripts/release-pr-template.ejs +++ b/.github/scripts/release-pr-template.ejs @@ -1,4 +1,4 @@ -This is a release PR for version **<%= version.actual %>**<% +This is a release PR for **<%= crate.name %>** version **<%= version.actual %>**<% if (version.actual != version.desired) { %> (performing a <%= version.desired %> bump).<% } else { @@ -28,7 +28,7 @@ You will still need to manually publish the cargo crate: ``` $ git pull -$ git switch --detach v{version} +$ git switch --detach <%= crate.name %>-<%= version.actual %> $ cargo publish -p <%= crate.name %> ``` diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml index 7b70ce37..e47a148e 100644 --- a/.github/workflows/release-pr.yml +++ b/.github/workflows/release-pr.yml @@ -36,5 +36,6 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} version: ${{ inputs.version }} crate-path: crates/${{ inputs.crate }} + pr-label: release pr-release-notes: ${{ inputs.crate == 'bin' }} pr-template-file: .github/scripts/release-pr-template.ejs diff --git a/crates/bin/release.toml b/crates/bin/release.toml index e72abc9c..db2a5847 100644 --- a/crates/bin/release.toml +++ b/crates/bin/release.toml @@ -1,5 +1,5 @@ -pre-release-commit-message = "release: v{{version}}" -tag-prefix = "cli-" +pre-release-commit-message = "release: cargo-binstall v{{version}}" +tag-prefix = "" tag-message = "cargo-binstall {{version}}" # We wait until the release CI is done before publishing,