Skip to content

Commit 5ed8c2c

Browse files
authored
Merge branch 'main' into vherremi/commitSHAUpdate
2 parents f82f62f + c3e7ba5 commit 5ed8c2c

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

.github/workflows/post-release-version-bump.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,5 @@ jobs:
144144
git add CHANGELOG.md
145145
if ! git diff --quiet --cached; then
146146
git commit -m "Force our CHANGELOG to override merge conflicts"
147-
git push origin "post-release-${VERSION}"
147+
git push origin "prepare-main-for-next-dev-cycle-${VERSION}"
148148
fi

.github/workflows/pr-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Python Instrumentation PR Build
22
on:
33
pull_request:
4+
types:
5+
- opened
6+
- reopened
7+
- synchronize
8+
- labeled
9+
- unlabeled
410
branches:
511
- main
612
- "release/v*"

0 commit comments

Comments
 (0)