From a1dd52447121eaca10004567c847164b4df874a9 Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Mon, 31 Jul 2023 15:35:38 +0200 Subject: [PATCH] Try to fix using the merge queue (#1009) --- .github/workflows/build.yml | 3 ++- .github/workflows/danger.yml | 2 +- .github/workflows/gradle-wrapper-validation.yml | 3 ++- .github/workflows/quality.yml | 3 ++- .github/workflows/tests.yml | 3 ++- .github/workflows/validate-lfs.yml | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 657dc7c772..b96e17a306 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,8 @@ name: APK Build on: workflow_dispatch: - pull_request: { } + pull_request: + merge_group: push: branches: [ develop ] diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 3fd17939e0..cbc57274db 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -1,6 +1,6 @@ name: Danger CI -on: [pull_request] +on: [pull_request, merge_group] jobs: build: diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 7b68c0077d..271c5399f6 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -1,6 +1,7 @@ name: "Validate Gradle Wrapper" on: - pull_request: { } + pull_request: + merge_group: push: branches: [ main, develop ] diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 6c21ddc55a..b4258627f0 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -2,7 +2,8 @@ name: Code Quality Checks on: workflow_dispatch: - pull_request: { } + pull_request: + merge_group: push: branches: [ main, develop ] diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e4f2300b4c..5eece16f26 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,7 +2,8 @@ name: Test on: workflow_dispatch: - pull_request: { } + pull_request: + merge_group: push: branches: [ main, develop ] diff --git a/.github/workflows/validate-lfs.yml b/.github/workflows/validate-lfs.yml index 25fe50359c..b1d6d8af6f 100644 --- a/.github/workflows/validate-lfs.yml +++ b/.github/workflows/validate-lfs.yml @@ -1,6 +1,6 @@ name: Validate Git LFS -on: [pull_request] +on: [pull_request, merge_group] jobs: build: