Skip to content

Commit a167d8e

Browse files
Merge pull request #118 from wphillipmoore/release/1.1.4
release: 1.1.4
2 parents a411a25 + 8f252d8 commit a167d8e

4 files changed

Lines changed: 43 additions & 19 deletions

File tree

.github/workflows/publish.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,18 @@ jobs:
162162
echo "needed=true" >> "$GITHUB_OUTPUT"
163163
fi
164164
165+
- name: Generate app token for bump PR
166+
if: steps.tag_check.outputs.exists == 'false' && steps.bump_check.outputs.needed == 'true'
167+
id: app-token
168+
uses: actions/create-github-app-token@v1
169+
with:
170+
app-id: ${{ secrets.APP_ID }}
171+
private-key: ${{ secrets.APP_PRIVATE_KEY }}
172+
165173
- name: Create version bump PR
166174
if: steps.tag_check.outputs.exists == 'false' && steps.bump_check.outputs.needed == 'true'
167175
env:
168-
GH_TOKEN: ${{ github.token }}
176+
GH_TOKEN: ${{ steps.app-token.outputs.token }}
169177
run: |
170178
git checkout -b "${{ steps.next_version.outputs.branch }}" origin/develop
171179
git merge origin/main --no-edit

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](https://semver.org/).
77

8+
## [1.1.4] - 2026-02-17
9+
10+
### Bug fixes
11+
12+
- sync prepare_release.py ruff formatting from canonical (#113)
13+
14+
### Features
15+
16+
- use GitHub App token for bump PR to trigger CI (#116)
17+
818
## [1.1.3] - 2026-02-16
919

1020
### Bug fixes

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>io.github.wphillipmoore</groupId>
99
<artifactId>mq-rest-admin</artifactId>
10-
<version>1.1.3</version>
10+
<version>1.1.4</version>
1111
<packaging>jar</packaging>
1212

1313
<name>mq-rest-admin</name>
@@ -44,7 +44,7 @@
4444
<gson.version>2.13.2</gson.version>
4545

4646
<!-- Test dependency versions -->
47-
<junit-jupiter.version>5.14.3</junit-jupiter.version>
47+
<junit-jupiter.version>6.0.3</junit-jupiter.version>
4848
<mockito.version>5.21.0</mockito.version>
4949
<assertj.version>3.27.7</assertj.version>
5050

@@ -54,7 +54,7 @@
5454
<jspecify.version>1.0.0</jspecify.version>
5555

5656
<!-- Plugin versions -->
57-
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
57+
<maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
5858
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
5959
<maven-failsafe-plugin.version>3.5.4</maven-failsafe-plugin.version>
6060
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>

scripts/dev/prepare_release.py

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,17 @@ def merge_main(version: str) -> None:
162162
"""
163163
print("Merging main into release branch...")
164164
run_command(("git", "fetch", "origin", "main"))
165-
run_command((
166-
"git", "merge", "origin/main",
167-
"-X", "ours",
168-
"-m", f"chore: merge main into release/{version}",
169-
))
165+
run_command(
166+
(
167+
"git",
168+
"merge",
169+
"origin/main",
170+
"-X",
171+
"ours",
172+
"-m",
173+
f"chore: merge main into release/{version}",
174+
)
175+
)
170176

171177

172178
def generate_changelog(version: str) -> bool:
@@ -197,18 +203,18 @@ def create_pr(version: str, issue: int) -> str:
197203
"""Create a PR to main and return the PR URL."""
198204
print("Creating pull request to main...")
199205
title = f"release: {version}"
200-
body = (
201-
f"## Summary\n\n"
202-
f"Release {version}\n\n"
203-
f"Ref #{issue}\n\n"
204-
f"Generated with `prepare_release.py`\n"
205-
)
206+
body = f"## Summary\n\nRelease {version}\n\nRef #{issue}\n\nGenerated with `prepare_release.py`\n"
206207
result = subprocess.run( # noqa: S603
207208
(
208-
"gh", "pr", "create",
209-
"--base", "main",
210-
"--title", title,
211-
"--body", body,
209+
"gh",
210+
"pr",
211+
"create",
212+
"--base",
213+
"main",
214+
"--title",
215+
title,
216+
"--body",
217+
body,
212218
),
213219
check=True,
214220
text=True,

0 commit comments

Comments
 (0)