diff --git a/.github/workflows/branches-and-prs.main.kts b/.github/workflows/branches-and-prs.main.kts index 4ff1e52191..17a0ce5fe3 100755 --- a/.github/workflows/branches-and-prs.main.kts +++ b/.github/workflows/branches-and-prs.main.kts @@ -24,6 +24,7 @@ import io.github.typesafegithub.workflows.actions.gradle.GradleBuildActionV2 import io.github.typesafegithub.workflows.domain.Concurrency import io.github.typesafegithub.workflows.domain.RunnerType import io.github.typesafegithub.workflows.domain.RunnerType.UbuntuLatest +import io.github.typesafegithub.workflows.domain.triggers.MergeGroup import io.github.typesafegithub.workflows.domain.triggers.PullRequest import io.github.typesafegithub.workflows.domain.triggers.Push import io.github.typesafegithub.workflows.dsl.expressions.Contexts.github @@ -40,7 +41,8 @@ workflow( "gh-pages" ) ), - PullRequest() + PullRequest(), + MergeGroup() ), sourceFile = __FILE__.toPath(), targetFileName = "${__FILE__.name.substringBeforeLast(".main.kts")}.yml", diff --git a/.github/workflows/branches-and-prs.yml b/.github/workflows/branches-and-prs.yml index e852b3108e..6b3814dcc8 100644 --- a/.github/workflows/branches-and-prs.yml +++ b/.github/workflows/branches-and-prs.yml @@ -9,6 +9,7 @@ on: - 'master' - 'gh-pages' pull_request: {} + merge_group: {} concurrency: group: '${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}' cancel-in-progress: true diff --git a/.github/workflows/codeql-analysis.main.kts b/.github/workflows/codeql-analysis.main.kts index d51de89ded..a9a6e15e69 100755 --- a/.github/workflows/codeql-analysis.main.kts +++ b/.github/workflows/codeql-analysis.main.kts @@ -25,6 +25,7 @@ import io.github.typesafegithub.workflows.actions.gradle.GradleBuildActionV2 import io.github.typesafegithub.workflows.domain.Concurrency import io.github.typesafegithub.workflows.domain.RunnerType.UbuntuLatest import io.github.typesafegithub.workflows.domain.triggers.Cron +import io.github.typesafegithub.workflows.domain.triggers.MergeGroup import io.github.typesafegithub.workflows.domain.triggers.PullRequest import io.github.typesafegithub.workflows.domain.triggers.Push import io.github.typesafegithub.workflows.domain.triggers.Schedule @@ -40,6 +41,7 @@ workflow( branches = listOf("!dependabot/**") ), PullRequest(), + MergeGroup(), Schedule( listOf( Cron( diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2ad37db671..d3ae600ee2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -8,6 +8,7 @@ on: branches: - '!dependabot/**' pull_request: {} + merge_group: {} schedule: - cron: '0 15 * * TUE' concurrency: diff --git a/.github/workflows/common.main.kts b/.github/workflows/common.main.kts index 1742863719..a47c93e323 100755 --- a/.github/workflows/common.main.kts +++ b/.github/workflows/common.main.kts @@ -16,7 +16,7 @@ * limitations under the License. */ -@file:DependsOn("io.github.typesafegithub:github-workflows-kt:0.44.0") +@file:DependsOn("io.github.typesafegithub:github-workflows-kt:0.49.0") import io.github.typesafegithub.workflows.domain.Job import io.github.typesafegithub.workflows.domain.JobOutputs.EMPTY diff --git a/.github/workflows/gradle-wrapper-validation.main.kts b/.github/workflows/gradle-wrapper-validation.main.kts index 066f367e3a..a31406a13f 100755 --- a/.github/workflows/gradle-wrapper-validation.main.kts +++ b/.github/workflows/gradle-wrapper-validation.main.kts @@ -21,6 +21,7 @@ import io.github.typesafegithub.workflows.actions.actions.CheckoutV3 import io.github.typesafegithub.workflows.actions.gradle.WrapperValidationActionV1 import io.github.typesafegithub.workflows.domain.RunnerType.UbuntuLatest +import io.github.typesafegithub.workflows.domain.triggers.MergeGroup import io.github.typesafegithub.workflows.domain.triggers.PullRequest import io.github.typesafegithub.workflows.domain.triggers.Push import io.github.typesafegithub.workflows.dsl.workflow @@ -30,7 +31,8 @@ workflow( name = "Validate Gradle Wrapper", on = listOf( Push(), - PullRequest() + PullRequest(), + MergeGroup() ), sourceFile = __FILE__.toPath(), targetFileName = "${__FILE__.name.substringBeforeLast(".main.kts")}.yml" diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 01ced15136..6f14f90bdf 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -6,6 +6,7 @@ name: 'Validate Gradle Wrapper' on: push: {} pull_request: {} + merge_group: {} jobs: check_yaml_consistency: name: 'Check YAML consistency'