Skip to content

Commit

Permalink
Add merge_group triggers to GHA CI workflows (#19749)
Browse files Browse the repository at this point in the history
  • Loading branch information
r0mant authored Dec 30, 2022
1 parent 8ca9037 commit 844fff1
Show file tree
Hide file tree
Showing 20 changed files with 126 additions and 0 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/build-macos-bypass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ on:
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths-ignore:
- '**.go'
- 'go.mod'
- 'go.sum'
- '**.rs'
- 'Cargo.toml'
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
build:
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ on:
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths:
- '**.go'
- 'go.mod'
- 'go.sum'
- '**.rs'
- 'Cargo.toml'
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
build:
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/build-windows-bypass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ on:
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
# We only build tsh on Windows so only consider Go code as tsh doesn't
# run any Rust.
paths-ignore:
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
build:
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/build-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ on:
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
# We only build tsh on Windows so only consider Go code as tsh doesn't
# run any Rust.
paths:
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/doc-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- master
pull_request:
merge_group:

jobs:
doc-tests:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/integration-tests-non-root-bypass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ on:
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths-ignore:
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
test:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/integration-tests-non-root.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ on:
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths:
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
test:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/integration-tests-root-bypass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ on:
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths-ignore:
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
test:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/integration-tests-root.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ on:
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths:
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
test:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- master
pull_request:
merge_group:

jobs:
lint:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/os-compatibility-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- master
pull_request:
merge_group:

jobs:
build:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/terraform-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ on:
- '**.tf'
- '**.tf.json'
- '**.hcl'
merge_group:
paths:
- '**.tf'
- '**.tf.json'
- '**.hcl'
workflow_dispatch:

jobs:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/unit-tests-code-bypass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ on:
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths-ignore:
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
test:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/unit-tests-code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ on:
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths:
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
test:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/unit-tests-helm-bypass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ on:
pull_request:
paths-ignore:
- 'examples/chart/**'
merge_group:
paths-ignore:
- 'examples/chart/**'

jobs:
test:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/unit-tests-helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
pull_request:
paths:
- 'examples/chart/**'
merge_group:
paths:
- 'examples/chart/**'

jobs:
test:
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/unit-tests-operator-bypass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ on:
- 'lib/tbot/**'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths-ignore:
- '/go.mod'
- '/go.sum'
- 'operator/**'
- 'api/types/**'
- 'lib/tbot/**'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
test:
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/unit-tests-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ on:
- 'lib/tbot/**'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths:
- '/go.mod'
- '/go.sum'
- 'operator/**'
- 'api/types/**'
- 'lib/tbot/**'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
test:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/unit-tests-rust-bypass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ on:
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths-ignore:
- '**.rs'
- 'Cargo.toml'
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
test:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/unit-tests-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ on:
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
merge_group:
paths:
- '**.rs'
- 'Cargo.toml'
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'

jobs:
test:
Expand Down

0 comments on commit 844fff1

Please sign in to comment.