Enable GHMQ, Remove Bors

rtic-rs · Jul 5, 2023 · a2a7bc5 · a2a7bc5
1 parent fe97aa3
commit a2a7bc5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/.github/bors.toml b/.github/bors.toml
diff --git 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,18 +49,13 @@ 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
 
       - name: cargo clippy
         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: