Skip to content

Commit

Permalink
enhance: [cherry-pick] adjust workflow for merr & branches (#652) (#653)
Browse files Browse the repository at this point in the history
/kind enhancement

Signed-off-by: Congqi Xia <[email protected]>
  • Loading branch information
congqixia committed Jan 17, 2024
1 parent 66ba4c6 commit 7ed1669
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
12 changes: 0 additions & 12 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,6 @@ pull_request_rules:
add:
- ci-passed

- name: Test passed for code changed for branch
conditions:
- or:
- base=master
- base~=^v2(\.\d+).x$
- "status-success=Unittest AMD64 Ubuntu 18.04"
- "status-success=lint"
actions:
label:
add:
- ci-passed

- name: Test passed for e2e changed
conditions:
- or:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- 'internal/**'
- 'test/**'
- 'tests/**'
- 'merr/**'
jobs:
test:
name: Run Ci Test
Expand Down

0 comments on commit 7ed1669

Please sign in to comment.