diff --git a/.github/bors.toml b/.github/bors.toml deleted file mode 100644 index e52aa089..00000000 --- a/.github/bors.toml +++ /dev/null @@ -1,2 +0,0 @@ -delete_merged_branches = true -status = ["ci"] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29fcff6d..58f16f48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,9 +5,8 @@ on: branches: [ main, staging, trying ] pull_request: branches: [ main ] + merge_group: -# NOTE if you add, remove or rename a job you'll need to update the list of -# jobs in the `ci` step (at the bottom of this file) jobs: test: strategy: @@ -40,15 +39,3 @@ jobs: - run: cargo fmt --check - run: cargo clippy --all-targets -- -D warnings - - # Refs: https://github.com/rust-lang/crater/blob/9ab6f9697c901c4a44025cf0a39b73ad5b37d198/.github/workflows/bors.yml#L125-L149 - # bors.tech integration - ci: - if: ${{ success() }} - needs: - - test - - static - runs-on: ubuntu-latest - steps: - - name: CI succeeded - run: exit 0 diff --git a/CHANGELOG.md b/CHANGELOG.md index f3ac1db2..7a7ef961 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +- [#404] Switch from bors to merge queue + +[#404]: https://github.com/knurling-rs/probe-run/pull/404 + ## [v0.3.9] - 2023-05-05 - [#403] Release `probe-run v0.3.9`