Skip to content

Commit 1b7caed

Browse files
committed
Fix pre-release script (take 2)
1 parent dc60546 commit 1b7caed

2 files changed

Lines changed: 1 addition & 7 deletions

File tree

.github/workflows/prepare-release.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,3 @@ jobs:
5151
Release preparation triggered by @${{ github.event.sender.login }}.
5252
5353
Once the pull request is merged, you can trigger a PyPI release by creating a GitHub release for \`${{ github.event.inputs.version }}\` in the repository.
54-
55-
- name: Enable auto-merge for the pull request
56-
uses: alexwilson/enable-github-automerge-action@1.0.0
57-
with:
58-
github-token: ${{ steps.generate_token.outputs.token }}
59-
merge-method: "SQUASH"

scripts/prepare-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ echo "-- Running towncrier --"
4444
towncrier --yes
4545

4646
echo "-- Committing changes --"
47-
git commit -am "Prepare for release of version ${VERSION} [skip ci]"
47+
git commit -am "Prepare for release of version ${VERSION}"
4848

4949
if [ "${CI}" ]; then
5050
git push origin "task/prepare-release-${VERSION}"

0 commit comments

Comments
 (0)