Skip to content

Commit a5f9b82

Browse files
Merge pull request #303 from wphillipmoore/release/1.1.6
release: 1.1.6
2 parents 7834f0a + 36921e0 commit a5f9b82

5 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
@@ -158,10 +158,18 @@ jobs:
158158
echo "needed=true" >> "$GITHUB_OUTPUT"
159159
fi
160160
161+
- name: Generate app token for bump PR
162+
if: steps.bump_check.outputs.needed == 'true'
163+
id: app-token
164+
uses: actions/create-github-app-token@v1
165+
with:
166+
app-id: ${{ secrets.APP_ID }}
167+
private-key: ${{ secrets.APP_PRIVATE_KEY }}
168+
161169
- name: Create version bump PR
162170
if: steps.bump_check.outputs.needed == 'true'
163171
env:
164-
GH_TOKEN: ${{ github.token }}
172+
GH_TOKEN: ${{ steps.app-token.outputs.token }}
165173
run: |
166174
git checkout -b "${{ steps.next_version.outputs.branch }}" origin/develop
167175
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.6] - 2026-02-17
9+
10+
### Bug fixes
11+
12+
- sync prepare_release.py ruff formatting from canonical (#298)
13+
14+
### Features
15+
16+
- use GitHub App token for bump PR to trigger CI (#300)
17+
818
## [1.1.5] - 2026-02-16
919

1020
### Bug fixes

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "pymqrest"
7-
version = "1.1.5"
7+
version = "1.1.6"
88
description = "Python wrapper for the IBM MQ REST API"
99
readme = "README.md"
1010
license = "GPL-3.0-or-later"

scripts/dev/prepare_release.py

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
"""
1515

1616
from __future__ import annotations
17-
1817
import argparse
1918
import re
2019
import shutil
2120
import subprocess
2221
import sys
2322
from pathlib import Path
2423

24+
2525
# -- helpers -----------------------------------------------------------------
2626

2727

@@ -161,11 +161,17 @@ def merge_main(version: str) -> None:
161161
"""
162162
print("Merging main into release branch...")
163163
run_command(("git", "fetch", "origin", "main"))
164-
run_command((
165-
"git", "merge", "origin/main",
166-
"-X", "ours",
167-
"-m", f"chore: merge main into release/{version}",
168-
))
164+
run_command(
165+
(
166+
"git",
167+
"merge",
168+
"origin/main",
169+
"-X",
170+
"ours",
171+
"-m",
172+
f"chore: merge main into release/{version}",
173+
)
174+
)
169175

170176

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

uv.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)