Skip to content

Commit 655b88e

Browse files
authored
Merge pull request #46 from GitGuardian/post-release-fixes
Post release fixes
2 parents d929950 + 074e43a commit 655b88e

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.github/workflows/test-lint.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ jobs:
7777
with:
7878
fetch-depth: 0
7979

80+
- name: Read info
81+
id: tags
82+
shell: bash
83+
run: |
84+
echo "tag=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
85+
8086
- name: Set up Python
8187
uses: actions/setup-python@v2
8288
with:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<a id='changelog-1.5.0'></a>
1212

13-
## 1.5.0 - 2022-11-28
13+
## 1.5.0 2022-11-28
1414

1515
### Added
1616

scripts/release

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@ def tag() -> None:
190190
tag = get_tag(version)
191191
message = f"Releasing {version}"
192192
check_run(["git", "tag", "--annotate", tag, "--message", message])
193-
check_run(["git", "push", "origin", "main:main", f"{tag}:{tag}"])
193+
check_run(
194+
["git", "push", "origin", f"{RELEASE_BRANCH}:{RELEASE_BRANCH}", f"{tag}:{tag}"]
195+
)
194196

195197

196198
def get_release_notes(version: str) -> str:
@@ -199,9 +201,7 @@ def get_release_notes(version: str) -> str:
199201

200202
# Extract changes from CHANGELOG.md
201203
changes = CHANGELOG_PATH.read_text()
202-
start_match = re.search(
203-
f"^## {re.escape(version)} - .*", changes, flags=re.MULTILINE
204-
)
204+
start_match = re.search(f"^## {re.escape(version)} .*", changes, flags=re.MULTILINE)
205205
assert start_match
206206
start_pos = start_match.end() + 1
207207

0 commit comments

Comments
 (0)