Skip to content

Commit

Permalink
ci: Modify ACN PR pipeline for merge queue use (#2399)
Browse files Browse the repository at this point in the history
* test: merge-queue test

* ci: add merge queue

* chore: change DAG dependencies

* ci: add UT to mq runs

* ci: add merge_group for GHA

* ci: add if to codeql
  • Loading branch information
jpayne3506 committed Dec 20, 2023
1 parent f8e430f commit 3c7cbe0
Show file tree
Hide file tree
Showing 4 changed files with 552 additions and 488 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- master
- release/*
pull_request:
branches:
branches:
- master
- release/*
types:
Expand All @@ -14,8 +14,12 @@ on:
- synchronize
- ready_for_review
workflow_dispatch:
merge_group:
types:
- checks_requested
jobs:
analyze:
if: ${{ github.event_name == 'pull_request' }}
name: Analyze
strategy:
fail-fast: false
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/crdgen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
- reopened
- synchronize
- ready_for_review
merge_group:
types:
- checks_requested
jobs:
crdgen:
strategy:
Expand All @@ -21,7 +24,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}
go-version: ${{ matrix.go-version }}
- name: Regenerate NodeNetworkConfig CRD
run: make -C crd/nodenetworkconfig
- name: Regenerate MultitenantNetworkContainer CRD
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
- reopened
- synchronize
- ready_for_review
merge_group:
types:
- checks_requested
jobs:
golangci:
strategy:
Expand All @@ -19,7 +22,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}
go-version: ${{ matrix.go-version }}
- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand Down
Loading

0 comments on commit 3c7cbe0

Please sign in to comment.