ci: Run checks on merge queues

OmriCat · Jul 20, 2023 · d4dd5c7 · d4dd5c7
1 parent 82b9cc7
commit d4dd5c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/data-integration-tests.yml b/.github/workflows/data-integration-tests.yml
@@ -1,9 +1,11 @@
 name: Data layer integration tests
 
 on:
+  workflow_dispatch:
   pull_request:
-    branches:
-      - '*'
+    branches-ignore:
+      - 'develop'
+  merge_group:
 
 jobs:
   data-layer-integration-tests:
@@ -14,14 +16,14 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-#        api-level: [ 30 ]
-#        target: [ google_apis ]
+        #        api-level: [ 30 ]
+        #        target: [ google_apis ]
         include:
           - api-level: 30
             target: google_atd
     steps:
 
-        # Docker can't be pre-installed on macos due to licensing issues so this is a workaround
+      # Docker can't be pre-installed on macos due to licensing issues so this is a workaround
       - name: Setup docker on macos
         run: |
           brew install docker

diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml
@@ -2,11 +2,10 @@ name: Pre Merge Checks
 
 on:
   push:
-    branches:
+    branches-ignore:
       - develop
   pull_request:
-    branches:
-      - '*'
+  merge_group:
 
 jobs:
   gradle-validation: