From 80ac18d23c51249c3708c55816af969aae8e88b0 Mon Sep 17 00:00:00 2001 From: jedel1043 Date: Thu, 4 May 2023 20:42:09 -0600 Subject: [PATCH] Enable github queues and remove bors.toml --- .github/workflows/rust.yml | 4 ++-- .github/workflows/test262.yml | 2 ++ .github/workflows/webassembly.yml | 2 ++ bors.toml | 18 ------------------ 4 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 bors.toml diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e8611d21e44..cb6a2401bf9 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -7,8 +7,8 @@ on: push: branches: - main - - staging # bors - - trying # bors + merge_group: + types: [checks_requested] jobs: coverage: diff --git a/.github/workflows/test262.yml b/.github/workflows/test262.yml index 77b2d406315..addb9a9659c 100644 --- a/.github/workflows/test262.yml +++ b/.github/workflows/test262.yml @@ -8,6 +8,8 @@ on: pull_request: branches: - main + merge_group: + types: [checks_requested] jobs: run_test262: diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index 02a758dcec7..cf73bbfc474 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -5,6 +5,8 @@ on: push: branches: - main + merge_group: + types: [checks_requested] name: Webassembly demo diff --git a/bors.toml b/bors.toml deleted file mode 100644 index ab5bf23a1d6..00000000000 --- a/bors.toml +++ /dev/null @@ -1,18 +0,0 @@ -# docs https://bors.tech/documentation/ -status = [ - "Coverage", - "Build and Test (macos-latest)", - "Build and Test (windows-latest)", - "Misc", -] -pr_status = [ - "Coverage", - "Build and Test (macos-latest)", - "Build and Test (windows-latest)", - "Misc", -] -block_labels = [ "blocked" ] -required_approvals = 2 -delete_merged_branches = true -use_squash_merge = true -update_base_for_deletes = true