From e3cb096ef05fc76b11c7677a6920909d74774a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <mockersf@gmail.com>
Date: Wed, 18 Aug 2021 02:41:11 +0200
Subject: [PATCH 1/3] check that benches still build

---
 .github/bors.toml        |  1 +
 .github/workflows/ci.yml | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/.github/bors.toml b/.github/bors.toml
index 13febb3bedd92..4e8d0332954d4 100644
--- a/.github/bors.toml
+++ b/.github/bors.toml
@@ -13,6 +13,7 @@ status = [
     "check-missing-examples-in-docs",
     "check-unused-dependencies",
     "ci",
+    "check-benches",
 ]
 
 use_squash_merge = true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8876a38cebdd..2a79ba073408d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -70,6 +70,30 @@ jobs:
         # See tools/ci/src/main.rs for the commands this runs
         run: cargo run -p ci
 
+  check-benches:
+    runs-on: ubuntu-latest
+    needs: ci
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-check-benches-${{ hashFiles('**/Cargo.toml') }}
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          components: rustfmt, clippy
+          override: true
+      - name: Install alsa and udev
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
+      - name: Check Benches
+        run: cd benches && cargo check --benches
+
   build-wasm:
     strategy:
       matrix:

From 6eaca55068f27d02e6fb19c06740c1fc3b6d40e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <mockersf@gmail.com>
Date: Wed, 18 Aug 2021 02:53:36 +0200
Subject: [PATCH 2/3] removed unused components

Co-Authored-By: MinerSebas <66798382+MinerSebas@users.noreply.github.com>
---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a79ba073408d..bd06f47fab5fc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,7 +87,6 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
-          components: rustfmt, clippy
           override: true
       - name: Install alsa and udev
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev

From 531afe5598558e646bbdd7adbce8c6af0b1a4e8f Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Wed, 25 Aug 2021 17:24:26 -0700
Subject: [PATCH 3/3] fix benchmark build

---
 benches/benches/bevy_ecs/commands.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/benches/benches/bevy_ecs/commands.rs b/benches/benches/bevy_ecs/commands.rs
index 2d2c27f648e2d..620b1915f9aa1 100644
--- a/benches/benches/bevy_ecs/commands.rs
+++ b/benches/benches/bevy_ecs/commands.rs
@@ -13,8 +13,8 @@ criterion_group!(
     fake_commands,
     zero_sized_commands,
     medium_sized_commands,
-    large_sized_commands
-    get_or_spawn,
+    large_sized_commands,
+    get_or_spawn
 );
 criterion_main!(benches);