Merge pull request #131 from crepererum-oss/crepererum/gh_merge_queue

chore: switch to GitHub merge queue
crepererum-oss · Feb 29, 2024 · 2f74d71 · 2f74d71
2 parents 44d4c8a + d935bcc
commit 2f74d71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,12 +2,11 @@ name: CI
 
 
 on:
+  merge_group:
   pull_request:
   push:
     branches:
-      - master
-      - staging
-      - trying
+      - main
     tags:
       - v*
 

diff --git a/bors.toml b/bors.toml
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,12 +2,11 @@ name: CI @@
     on:
+      merge_group:
       pull_request:
       push:
         branches:
-          - master
-          - staging
-          - trying
+          - main
         tags:
           - v*
@@ Expand Down @@