Skip to content

Commit

Permalink
ci: add merge_queue trigger for required workflows (#15847)
Browse files Browse the repository at this point in the history
  • Loading branch information
julienrbrt authored Apr 14, 2023
1 parent c4489d9 commit d7c8353
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Build SimApp
# This workflow is run on pushes to main & every Pull Requests where a .go, .mod, .sum have been changed
on:
pull_request:
merge_group:
push:
branches:
- main
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/dependencies-review.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: "Dependency Review"
on: pull_request
on:
pull_request:
merge_group:

permissions:
contents: read
Expand All @@ -15,6 +17,9 @@ jobs:
go-version: 1.20.3
- name: "Dependency Review"
uses: actions/dependency-review-action@v3
with:
base-ref: ${{ github.event.pull_request.base.sha || 'main' }}
head-ref: ${{ github.event.pull_request.head.sha || github.ref }}
- name: "Dependency audit"
run: ./scripts/dep-assert.sh
- name: "Go vulnerability check"
Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ on:
- main
- release/**
pull_request:
merge_group:
permissions:
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
# pull-requests: read
jobs:
golangci:
name: golangci-lint
Expand All @@ -18,4 +17,16 @@ jobs:
- uses: actions/setup-go@v4
with:
go-version: 1.20.3
- run: make lint
- uses: technote-space/[email protected]
id: git_diff
with:
PATTERNS: |
**/*.go
go.mod
go.sum
**/go.mod
**/go.sum
- name: run linting
if: env.GIT_DIFF
run: |
make lint
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Tests / Code Coverage
on:
pull_request:
merge_group:
push:
branches:
- main
Expand Down Expand Up @@ -64,6 +65,8 @@ jobs:
go.sum
**/go.mod
**/go.sum
**/Makefile
Makefile
- uses: actions/download-artifact@v3
with:
name: "${{ github.sha }}-${{ matrix.part }}"
Expand Down

0 comments on commit d7c8353

Please sign in to comment.