From a2a7bc587ee804f53abe8e45e3221d8a781d5342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Wed, 5 Jul 2023 21:49:21 +0200 Subject: [PATCH] Enable GHMQ, Remove Bors --- .github/bors.toml | 4 ---- .github/workflows/build.yml | 14 +------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 .github/bors.toml diff --git a/.github/bors.toml b/.github/bors.toml deleted file mode 100644 index 448ebf7..0000000 --- a/.github/bors.toml +++ /dev/null @@ -1,4 +0,0 @@ -block_labels = ["S-blocked"] -delete_merged_branches = true -required_approvals = 1 -status = ["ci"] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a63ac8..1aa7fdb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,11 +1,10 @@ name: Build on: + merge_group: pull_request: push: branches: - master - - staging - - trying env: CARGO_TERM_COLOR: always @@ -21,9 +20,6 @@ jobs: - name: Cache Dependencies uses: Swatinem/rust-cache@v2 - - name: Fail on warnings - run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs - - name: cargo fmt --check run: cargo fmt --all -- --check @@ -39,9 +35,6 @@ jobs: - name: Cache Dependencies uses: Swatinem/rust-cache@v2 - - name: Fail on warnings - run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs - - name: Cache Dependencies uses: Swatinem/rust-cache@v1 @@ -56,9 +49,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Fail on warnings - run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs - - name: Cache Dependencies uses: Swatinem/rust-cache@v2 @@ -66,8 +56,6 @@ jobs: run: cargo clippy - # Refs: https://github.com/rust-lang/crater/blob/9ab6f9697c901c4a44025cf0a39b73ad5b37d198/.github/workflows/bors.yml#L125-L149 - # # ALL THE PREVIOUS JOBS NEEDS TO BE ADDED TO THE `needs` SECTION OF THIS JOB! ci-success: