From 7f5d1555e93067ca26428fe2b91771c710068b53 Mon Sep 17 00:00:00 2001 From: Norbert Elter <72046715+itsyoboieltr@users.noreply.github.com> Date: Tue, 3 Sep 2024 23:04:32 +0400 Subject: [PATCH 1/2] feat: add merge group event --- .github/workflows/run-integration-tests.yml | 1 + .github/workflows/run-unit-tests.yml | 1 + .github/workflows/security-code-scanner.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml index 8de1899e0dfa..e8b6b1bd7f0e 100644 --- a/.github/workflows/run-integration-tests.yml +++ b/.github/workflows/run-integration-tests.yml @@ -5,6 +5,7 @@ on: branches: [develop, master] pull_request: types: [opened,reopened,synchronize] + merge_group: jobs: test-integration: diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 6765352f5d7d..74dd76006864 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -5,6 +5,7 @@ on: branches: [develop, master] pull_request: types: [opened,reopened,synchronize] + merge_group: jobs: test-unit: diff --git a/.github/workflows/security-code-scanner.yml b/.github/workflows/security-code-scanner.yml index 7da1773d666c..c5b22d405036 100644 --- a/.github/workflows/security-code-scanner.yml +++ b/.github/workflows/security-code-scanner.yml @@ -5,6 +5,7 @@ on: branches: [ 'develop' ] pull_request: branches: [ 'develop' ] + merge_group: jobs: run-security-scan: From 4cd4e3616477555f5326587de1dd50880517ca84 Mon Sep 17 00:00:00 2001 From: Norbert Elter <72046715+itsyoboieltr@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:06:48 +0200 Subject: [PATCH 2/2] fix --- .github/workflows/run-tests.yml | 1 + .github/workflows/security-code-scanner.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index a0240346af64..77958f69da2d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,6 +10,7 @@ on: - opened - reopened - synchronize + merge_group: jobs: test-unit: diff --git a/.github/workflows/security-code-scanner.yml b/.github/workflows/security-code-scanner.yml index c5b22d405036..7da1773d666c 100644 --- a/.github/workflows/security-code-scanner.yml +++ b/.github/workflows/security-code-scanner.yml @@ -5,7 +5,6 @@ on: branches: [ 'develop' ] pull_request: branches: [ 'develop' ] - merge_group: jobs: run-security-scan: