From fc487eff4472f742e2f53f56fa17898b3c946b5b Mon Sep 17 00:00:00 2001
From: messense <messense@icloud.com>
Date: Tue, 9 May 2023 23:29:59 +0800
Subject: [PATCH] Remove bors

---
 .cirrus.yml                | 2 +-
 .github/workflows/lint.yml | 7 +------
 README.md                  | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7763cb93e..1e073ce05 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,7 +5,7 @@ env:
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
 
 build_and_test: &BUILD_AND_TEST
-  # only run tasks on pull request or bors related branches
+  # only run tasks on pull request or github merge queue branches
   only_if: $CIRRUS_BRANCH =~ 'gh-readonly-queue/.*' || $CIRRUS_PR != ""
   setup_script:
     - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 92871e834..38b1ee73e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,12 +1,6 @@
 name: Lint
 
 on:
-  push:
-    branches:
-      # for bors r+
-      - staging
-      # for bors try
-      - trying
   pull_request:
     paths-ignore:
       - 'sysconfig/**'
@@ -14,6 +8,7 @@ on:
       - '.cirrus.yml'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/dependabot.yml'
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
diff --git a/README.md b/README.md
index 68e6311d8..24824e08e 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@ _formerly pyo3-pack_
 
 [![Actions Status](https://img.shields.io/github/actions/workflow/status/PyO3/maturin/test.yml?branch=main&logo=github&style=flat-square)](https://github.com/PyO3/maturin/actions)
 [![FreeBSD](https://img.shields.io/cirrus/github/PyO3/maturin/main?logo=CircleCI&style=flat-square)](https://cirrus-ci.com/github/PyO3/maturin)
-[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/55651)
 [![Crates.io](https://img.shields.io/crates/v/maturin.svg?logo=rust&style=flat-square)](https://crates.io/crates/maturin)
 [![PyPI](https://img.shields.io/pypi/v/maturin.svg?logo=python&style=flat-square)](https://pypi.org/project/maturin)
 [![Maturin User Guide](https://img.shields.io/badge/user-guide-brightgreen?logo=readthedocs&style=flat-square)](https://maturin.rs)