Merge pull request #111 from authzed/prepare-for-merge-queue

Prepare for merge queue
authzed · May 12, 2023 · 58d2b94 · 58d2b94
2 parents 5ca5523 + be86aca
commit 58d2b94
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -6,13 +6,16 @@ on:  # yamllint disable-line rule:truthy
       - "main"
   pull_request:
     branches: ["*"]
+  merge_group:
+    types:
+      - "checks_requested"
 jobs:
   test:
     name: "Run Integration Tests"
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v3"
-      - uses: "actions/setup-go@v3"
+      - uses: "actions/setup-go@v4"
         with:
           go-version: "~1.20"
       - uses: "authzed/action-spicedb@v1"
@@ -26,7 +29,7 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v3"
-      - uses: "actions/setup-go@v3"
+      - uses: "actions/setup-go@v4"
         with:
           go-version: "~1.20"
       - name: "Install Go Tools"

diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml
@@ -9,6 +9,9 @@ on:  # yamllint disable-line rule:truthy
       - "opened"
       - "closed"
       - "synchronize"
+  merge_group:
+    types:
+      - "checks_requested"
 jobs:
   cla:
     name: "Check Signature"

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -7,13 +7,16 @@ on:  # yamllint disable-line rule:truthy
       - "main"
   pull_request:
     branches: ["*"]
+  merge_group:
+    types:
+      - "checks_requested"
 jobs:
   go-lint:
     name: "Lint Go"
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v3"
-      - uses: "actions/setup-go@v3"
+      - uses: "actions/setup-go@v4"
         with:
           go-version: "~1.19"
       - uses: "authzed/actions/gofumpt@main"