From fba6b0e6bad4a7f13aad9aecfd7eab779c3ab2f4 Mon Sep 17 00:00:00 2001
From: Ulrik Sverdrup <bluss@users.noreply.github.com>
Date: Sat, 9 Mar 2024 16:13:11 +0100
Subject: [PATCH] ci: Setup so that most checks run in merge queue only

---
 .github/workflows/merge-check.yml | 52 -------------------------------
 .github/workflows/pr-check.yml    | 46 ++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 53 deletions(-)
 delete mode 100644 .github/workflows/merge-check.yml

diff --git a/.github/workflows/merge-check.yml b/.github/workflows/merge-check.yml
deleted file mode 100644
index 87c6de597..000000000
--- a/.github/workflows/merge-check.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-on:
-  merge_group:
-
-name: Merge Queue Check
-
-env:
-  CARGO_TERM_COLOR: always
-  HOST: x86_64-unknown-linux-gnu
-  FEATURES: "test docs"
-  RUSTFLAGS: "-D warnings"
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust:
-          - stable
-          - beta
-          - nightly
-          - 1.51.0  # MSRV
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ matrix.rust }}
-      - uses: Swatinem/rust-cache@v2
-      - name: Install openblas
-        run: sudo apt-get install libopenblas-dev gfortran
-      - run: ./scripts/all-tests.sh "$FEATURES" ${{ matrix.rust }}
-
-  cross_test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - rust: stable
-            target: powerpc-unknown-linux-gnu
-          - rust: stable
-            target: i686-unknown-linux-gnu
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ matrix.rust }}
-          targets: ${{ matrix.target }}
-      - uses: Swatinem/rust-cache@v2
-      - name: Install cross
-        run: cargo install cross
-      - run: ./scripts/cross-tests.sh "docs" ${{ matrix.rust }} ${{ matrix.target }}
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index 78760d306..76abf49fd 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -2,10 +2,12 @@ on:
   pull_request:
   merge_group:
 
-name: PR Check
+name: CI Check
 
 env:
   CARGO_TERM_COLOR: always
+  HOST: x86_64-unknown-linux-gnu
+  FEATURES: "test docs"
   RUSTFLAGS: "-D warnings"
 
 jobs:
@@ -23,3 +25,45 @@ jobs:
           components: clippy
       - uses: Swatinem/rust-cache@v2
       - run: cargo clippy --features docs
+  tests:
+    if: ${{ github.event_name == 'merge_group' }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - stable
+          - beta
+          - nightly
+          - 1.51.0  # MSRV
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.rust }}
+      - uses: Swatinem/rust-cache@v2
+      - name: Install openblas
+        run: sudo apt-get install libopenblas-dev gfortran
+      - run: ./scripts/all-tests.sh "$FEATURES" ${{ matrix.rust }}
+
+  cross_test:
+    if: ${{ github.event_name == 'merge_group' }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - rust: stable
+            target: powerpc-unknown-linux-gnu
+          - rust: stable
+            target: i686-unknown-linux-gnu
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.rust }}
+          targets: ${{ matrix.target }}
+      - uses: Swatinem/rust-cache@v2
+      - name: Install cross
+        run: cargo install cross
+      - run: ./scripts/cross-tests.sh "docs" ${{ matrix.rust }} ${{ matrix.target }}