diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml new file mode 100644 index 00000000000..2890138a2de --- /dev/null +++ b/.github/workflows/merge.yaml @@ -0,0 +1,9 @@ +on: + pull_request: + merge_group: + +jobs: + dummy: + runs-on: ubuntu-latest + steps: + - run: /usr/bin/true diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 713e3705b3e..00000000000 --- a/bors.toml +++ /dev/null @@ -1,6 +0,0 @@ -status = ["buildbot/ci-builder"] -delete_merged_branches = true -cut_body_after = "" -# A full run should complete within 12 hours, but we might add other -# configurations to it later, so add a little leeway. -timeout_sec = 86400 # 24 hours