Skip to content

Commit a45eb45

Browse files
committed
new branch: update backport workflow branch
1 parent 4dfe3bc commit a45eb45

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/backport.yml

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
11
name: Pull Request Backporting using Git Backporting
2-
32
on:
43
pull_request_target:
54
types:
65
- closed
76
- labeled
8-
97
env:
108
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
119
NO_SQUASH_OPTION: true
12-
1310
jobs:
1411
backporting:
1512
name: "Backporting"
1613
concurrency:
17-
group: backporting-${{ github.head_ref }}
18-
cancel-in-progress: true
14+
group: backporting-${{ github.head_ref }}
15+
cancel-in-progress: true
1916
# Only react to merged PRs for security reasons.
2017
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
2118
if: >
22-
github.event.pull_request.merged
23-
&& (
19+
github.event.pull_request.merged && (
20+
2421
github.event.action == 'closed'
2522
&& (contains(github.event.pull_request.labels.*.name, 'backport')
2623
|| contains(github.event.pull_request.labels.*.name, 'backport-squash'))
@@ -29,19 +26,20 @@ jobs:
2926
&& contains(github.event.label.name, 'backport')
3027
)
3128
)
29+
3230
runs-on: ubuntu-latest
3331
steps:
3432
- name: Override no-squash option
3533
if: >
36-
(github.event.action == 'closed' && contains(github.event.pull_request.labels.*.name, 'backport-squash'))
37-
|| (github.event.action == 'labeled' && contains(github.event.label.name, 'backport-squash'))
34+
(github.event.action == 'closed' && contains(github.event.pull_request.labels.*.name, 'backport-squash')) || (github.event.action == 'labeled' && contains(github.event.label.name, 'backport-squash'))
35+
3836
shell: bash
3937
run: |
4038
echo "NO_SQUASH_OPTION=false" >> $GITHUB_ENV
4139
- name: Backporting
4240
uses: kiegroup/git-backporting@v4
4341
with:
44-
target-branch: 0.13.x
42+
target-branch: 0.14
4543
pull-request: ${{ github.event.pull_request.url }}
4644
auth: ${{ secrets.RH_PERF_BOT_TOKEN }}
4745
no-squash: ${{ env.NO_SQUASH_OPTION }}

.github/workflows/branch.yml

+2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ jobs:
4040
run: ~/yq -i e '.on.push.branches |= [ "master", '${{ env.CUR_VERSION }}' ]' .github/workflows/main.yml
4141
- name: Update Notify clients workflow
4242
run: ~/yq -i e '.on.push.branches |= [ "master", '${{ env.CUR_VERSION }}' ]' .github/workflows/notify-clients.yaml
43+
- name: Update backport workflow
44+
run: ~/yq -i e '.jobs.backporting.steps[1].with.target-branch |= ${{ env.CUR_VERSION }}' .github/workflows/backport.yml
4345
- name: build new openapi.yaml
4446
run: mvn clean package -DskipTests -DskipITs -pl horreum-api
4547
- name: Commit main branch changes

0 commit comments

Comments
 (0)