Skip to content

Commit 1a0745f

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents de95627 + 03c270f commit 1a0745f

File tree

159 files changed

+57229
-2748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+57229
-2748
lines changed

.github/workflows/insta-merge.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Insta Merge Konflux PRs
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- manifests/base/params-latest.env
7+
types:
8+
- opened
9+
branches:
10+
- 'main'
11+
12+
permissions:
13+
contents: write
14+
pull-requests: write
15+
checks: write
16+
security-events: write
17+
statuses: write
18+
19+
jobs:
20+
instant-merge:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: insta-merge
24+
if: ${{ github.event.sender.login == 'red-hat-konflux[bot]' && ( contains(github.event.pull_request.title, 'Update odh-workbench-jupyter-') || contains(github.event.pull_request.title, 'Update odh-workbench-codeserver-') || contains(github.event.pull_request.title, 'Update odh-pipeline-runtime-') ) }}
25+
env:
26+
GITHUB_TOKEN: ${{ github.token }}
27+
run: |
28+
gh pr merge --merge --admin ${{ github.event.pull_request.html_url }}

0 commit comments

Comments
 (0)