Skip to content

Commit 6098d55

Browse files
author
Ryan Lymburner
authored
Enable separate validation on PR vs Push (#708)
* Enable separate validation on PR vs Push * Enable separate validation on PR vs Push
1 parent 964f9cd commit 6098d55

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

.github/workflows/e2e-test.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ permissions:
33
id-token: write
44
contents: read
55
on:
6-
merge_group:
7-
branches: [ "main" ]
6+
push:
7+
branches:
8+
- main
89
workflow_dispatch:
10+
workflow_call:
911
jobs:
1012
e2e-test:
1113
runs-on: ubuntu-latest

.github/workflows/presubmit.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
name: presubmit
22
on:
3-
pull_request:
4-
branches: [ "main" ]
53
workflow_dispatch:
4+
workflow_call:
65
jobs:
76
golangci-lint:
87
name: golangci-lint
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Validate code in the merge queue with e2e-test
2+
permissions:
3+
id-token: write
4+
contents: read
5+
on:
6+
merge_group:
7+
branches: [ "main" ]
8+
jobs:
9+
validate:
10+
uses: ./.github/workflows/e2e-test.yaml
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
name: Validate pull request with presubmit before putting into queue
2+
on:
3+
pull_request:
4+
jobs:
5+
validate:
6+
uses: ./.github/workflows/presubmit.yaml

0 commit comments

Comments
 (0)