From 92c9986d08c1b00d2eeb6bc532a516a1e84ea31a Mon Sep 17 00:00:00 2001
From: Bryce Lampe <bryce@pulumi.com>
Date: Wed, 9 Aug 2023 11:16:06 -0700
Subject: [PATCH 1/2] Remove Bors

If this PR merges cleanly it will confirm we will no longer need to use
Bors and can use merge queues instead.

Fixes https://github.com/pulumi/watchutil-rs/issues/35
---
 .github/workflows/ci.yml | 8 +-------
 bors.toml                | 8 --------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 bors.toml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d684e3f..c997185 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,12 +2,6 @@ name: Merge
 
 on:
   merge_group:
-  push:
-    branches:
-      - staging
-      - trying
-    tags-ignore:
-      - "*"
 
 jobs:
   info:
@@ -121,7 +115,7 @@ jobs:
     name: Publish
     needs: [test-ok, version-check, info]
     uses: ./.github/workflows/ci-publish.yml
-    if: github.ref_name == 'staging' || github.event_name == 'merge_group'
+    if: github.event_name == 'merge_group'
     with:
       version: ${{ needs.info.outputs.version }}
       release_notes: ${{ needs.info.outputs.release_notes }}
diff --git a/bors.toml b/bors.toml
deleted file mode 100644
index d6d7811..0000000
--- a/bors.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-delete_merged_branches = true
-update_base_for_deletes = true
-
-status = [
-	'Build OK',
-	'Test OK',
-	'Publish OK',
-]

From 84f5778ac608ab3ecc967880dabdc91c19abae1f Mon Sep 17 00:00:00 2001
From: Bryce Lampe <bryce@pulumi.com>
Date: Thu, 10 Aug 2023 15:55:56 -0700
Subject: [PATCH 2/2] no need to check event type

---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c997185..888580d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -115,7 +115,6 @@ jobs:
     name: Publish
     needs: [test-ok, version-check, info]
     uses: ./.github/workflows/ci-publish.yml
-    if: github.event_name == 'merge_group'
     with:
       version: ${{ needs.info.outputs.version }}
       release_notes: ${{ needs.info.outputs.release_notes }}