Merge pull request #2443 from HTGAzureX1212/nightly

Add Merge Group Test

.github/workflows/lints.yml

@@ -12,7 +12,7 @@ jobs:
   ClippyAll:
     name: Clippy
     runs-on: ubuntu-latest
-    
+
     steps:
       - uses: actions/checkout@v4
       - name: Install latest nightly Rust toolchain
@@ -23,7 +23,7 @@ jobs:
       - name: Install Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: "3.11"
       - name: Run Clippy
         run: python ./x.py clippy
 

.github/workflows/tests.yml

@@ -1,21 +1,24 @@
 name: Tests
 
 on:
+  merge_group:
+    types:
+      - checks_requested
+  pull_request:
   push:
     branches:
       - nightly
       - stable
-      - automation/bors/approve
-      - automation/bors/try
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   BuildAll:
     name: Build
+    if: ${{ github.event_name == 'merge_group' }}
     runs-on: ubuntu-latest
-    
+
     steps:
       - uses: actions/checkout@v4
       - name: Install latest nightly Rust toolchain
@@ -25,14 +28,15 @@ jobs:
       - name: Install Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: "3.11"
       - name: Run Build
         run: python ./x.py build
 
   TestAll:
     name: Test
     needs:
       - BuildAll
+    if: ${{ github.event_name == 'merge_group' }}
     runs-on: ubuntu-latest
 
     steps:
@@ -44,7 +48,7 @@ jobs:
       - name: Install Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: "3.11"
       - name: Run Build
         run: python ./x.py build -- discord-frontend
       - name: Run Tests