diff --git a/.github/workflows/build-macos-bypass.yaml b/.github/workflows/build-macos-bypass.yaml index e352b038ef6bc..8d3fca222d12d 100644 --- a/.github/workflows/build-macos-bypass.yaml +++ b/.github/workflows/build-macos-bypass.yaml @@ -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: diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 5d6de4fefe5d3..ca7889bee468a 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -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: diff --git a/.github/workflows/build-windows-bypass.yaml b/.github/workflows/build-windows-bypass.yaml index 25e2b8e755104..dfb4733c12e14 100644 --- a/.github/workflows/build-windows-bypass.yaml +++ b/.github/workflows/build-windows-bypass.yaml @@ -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: diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml index bc09713a7d15a..7a7f56ad2525c 100644 --- a/.github/workflows/build-windows.yaml +++ b/.github/workflows/build-windows.yaml @@ -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: diff --git a/.github/workflows/doc-tests.yaml b/.github/workflows/doc-tests.yaml index c4800de972371..2f34ccc91668e 100644 --- a/.github/workflows/doc-tests.yaml +++ b/.github/workflows/doc-tests.yaml @@ -5,6 +5,7 @@ on: branches: - master pull_request: + merge_group: jobs: doc-tests: diff --git a/.github/workflows/integration-tests-non-root-bypass.yaml b/.github/workflows/integration-tests-non-root-bypass.yaml index 9cc96ebe84e80..930e09ac0e698 100644 --- a/.github/workflows/integration-tests-non-root-bypass.yaml +++ b/.github/workflows/integration-tests-non-root-bypass.yaml @@ -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: diff --git a/.github/workflows/integration-tests-non-root.yaml b/.github/workflows/integration-tests-non-root.yaml index 72c4c714f2789..8d5a189160869 100644 --- a/.github/workflows/integration-tests-non-root.yaml +++ b/.github/workflows/integration-tests-non-root.yaml @@ -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: diff --git a/.github/workflows/integration-tests-root-bypass.yaml b/.github/workflows/integration-tests-root-bypass.yaml index 711ebdb1f2c77..3f868e3d4ee9b 100644 --- a/.github/workflows/integration-tests-root-bypass.yaml +++ b/.github/workflows/integration-tests-root-bypass.yaml @@ -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: diff --git a/.github/workflows/integration-tests-root.yaml b/.github/workflows/integration-tests-root.yaml index 6fb697736c385..c566b995713bb 100644 --- a/.github/workflows/integration-tests-root.yaml +++ b/.github/workflows/integration-tests-root.yaml @@ -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: diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 6dfff140e242d..b14f3751a7397 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -5,6 +5,7 @@ on: branches: - master pull_request: + merge_group: jobs: lint: diff --git a/.github/workflows/os-compatibility-test.yaml b/.github/workflows/os-compatibility-test.yaml index 876f9fe982f18..76d738ceca1ec 100644 --- a/.github/workflows/os-compatibility-test.yaml +++ b/.github/workflows/os-compatibility-test.yaml @@ -5,6 +5,7 @@ on: branches: - master pull_request: + merge_group: jobs: build: diff --git a/.github/workflows/terraform-lint.yaml b/.github/workflows/terraform-lint.yaml index b46d4bc3dfd15..82bb9781f80e2 100644 --- a/.github/workflows/terraform-lint.yaml +++ b/.github/workflows/terraform-lint.yaml @@ -14,6 +14,11 @@ on: - '**.tf' - '**.tf.json' - '**.hcl' + merge_group: + paths: + - '**.tf' + - '**.tf.json' + - '**.hcl' workflow_dispatch: jobs: diff --git a/.github/workflows/unit-tests-code-bypass.yaml b/.github/workflows/unit-tests-code-bypass.yaml index 54cba2e2d4695..f3b21330aed3f 100644 --- a/.github/workflows/unit-tests-code-bypass.yaml +++ b/.github/workflows/unit-tests-code-bypass.yaml @@ -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: diff --git a/.github/workflows/unit-tests-code.yaml b/.github/workflows/unit-tests-code.yaml index d7d07313eb577..b4faf804cbffc 100644 --- a/.github/workflows/unit-tests-code.yaml +++ b/.github/workflows/unit-tests-code.yaml @@ -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: diff --git a/.github/workflows/unit-tests-helm-bypass.yaml b/.github/workflows/unit-tests-helm-bypass.yaml index 80ff10fe8a1cb..cb593e17a5dd4 100644 --- a/.github/workflows/unit-tests-helm-bypass.yaml +++ b/.github/workflows/unit-tests-helm-bypass.yaml @@ -15,6 +15,9 @@ on: pull_request: paths-ignore: - 'examples/chart/**' + merge_group: + paths-ignore: + - 'examples/chart/**' jobs: test: diff --git a/.github/workflows/unit-tests-helm.yaml b/.github/workflows/unit-tests-helm.yaml index 70d9789b63e06..a4ebae567610b 100644 --- a/.github/workflows/unit-tests-helm.yaml +++ b/.github/workflows/unit-tests-helm.yaml @@ -8,6 +8,9 @@ on: pull_request: paths: - 'examples/chart/**' + merge_group: + paths: + - 'examples/chart/**' jobs: test: diff --git a/.github/workflows/unit-tests-operator-bypass.yaml b/.github/workflows/unit-tests-operator-bypass.yaml index 4ca23cd5983b3..cf77b1706dfb9 100644 --- a/.github/workflows/unit-tests-operator-bypass.yaml +++ b/.github/workflows/unit-tests-operator-bypass.yaml @@ -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: diff --git a/.github/workflows/unit-tests-operator.yaml b/.github/workflows/unit-tests-operator.yaml index 65c8e6a90c66e..be1e1a57c7059 100644 --- a/.github/workflows/unit-tests-operator.yaml +++ b/.github/workflows/unit-tests-operator.yaml @@ -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: diff --git a/.github/workflows/unit-tests-rust-bypass.yaml b/.github/workflows/unit-tests-rust-bypass.yaml index e9b1e67c1d932..c06ae56331447 100644 --- a/.github/workflows/unit-tests-rust-bypass.yaml +++ b/.github/workflows/unit-tests-rust-bypass.yaml @@ -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: diff --git a/.github/workflows/unit-tests-rust.yaml b/.github/workflows/unit-tests-rust.yaml index c68f76c91b8a5..cebfc909df7c6 100644 --- a/.github/workflows/unit-tests-rust.yaml +++ b/.github/workflows/unit-tests-rust.yaml @@ -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: