Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@ name: CI
on:
push:
branches: [main]
paths-ignore:
- '**.md'
- 'scripts/release.sh'
pull_request:
branches: [main]
paths-ignore:
- '**.md'
- 'scripts/release.sh'
workflow_dispatch:

permissions:
Expand Down
8 changes: 6 additions & 2 deletions scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,11 @@ cmd_bump() {
body+="- ${pretty} (\`${short}\`): \`${version}\`"$'\n'
done
body+=$'\nAfter merging, sign and push the release tags from main:\n\n```\nscripts/release.sh tag'
body+=" --remote $REMOTE"
for pair in "${PAIRS[@]}"; do body+=" ${pair}"; done
body+=$'\n```\n'

run gh repo set-default "$REMOTE"
run gh pr create \
--repo-clone-protocol https \
--base main \
Expand Down Expand Up @@ -320,8 +322,10 @@ cmd_tag() {
local actual
actual="$(read_toml_version "$cargo")" \
|| die "could not read current version from $cargo"
[[ "$actual" == "$version" ]] \
|| die "$cargo on main has version '$actual', expected '$version' (was the bump PR merged?)"
if [[ $DRY_RUN -eq 0 ]]; then
[[ "$actual" == "$version" ]] \
|| die "$cargo on main has version '$actual', expected '$version' (was the bump PR merged?)"
fi

local tag="${short}-v${version}"
if git -C "$REPO_ROOT" rev-parse -q --verify "refs/tags/$tag" >/dev/null; then
Expand Down
Loading