Update CI as a precursor to enabling merge queues

See #142
georust · Dec 20, 2023 · b1e98d7 · b1e98d7
1 parent 9f8c6b6
commit b1e98d7
Showing 1 changed file with 28 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,29 +1,44 @@
-on: push
+on:
+  push:
+    branches:
+      - main
+      - staging
+      - trying
+      - release/**
+  pull_request:
+  merge_group:
+
 name: Run tests
 jobs:
-  # The `ci-result` job doesn't actually test anything - it just aggregates the
-  # overall build status for bors, otherwise our bors.toml would need an entry
+  # The `ci-success` job doesn't actually test anything - it just aggregates the
+  # overall build status, otherwise the merge queue would need an entry
   # for each individual job produced by the job-matrix.
   #
-  # Ref: https://github.com/rust-lang/crater/blob/9ab6f9697c901c4a44025cf0a39b73ad5b37d198/.github/workflows/bors.yml#L125-L149
-  #
-  # ALL THE SUBSEQUENT JOBS NEED THEIR `name` ADDED TO THE `needs` SECTION OF THIS JOB!
-  ci-result:
+  # ALL THE SUBSEQUENT JOBS NEED THEIR `name` ADDED TO THE `needs` SECTION OF both "ci result" JOBS!
+  ci-success:
     name: ci result
     runs-on: ubuntu-latest
     needs:
       - rstar
       - check
       - no_std
+    if: success()
     steps:
       - name: Mark the job as a success
-        if: success()
         run: exit 0
+  ci-failure:
+    name: ci result
+    runs-on: ubuntu-latest
+    needs:
+      - rstar
+      - check
+      - no_std
+    if: failure()
+    steps:
       - name: Mark the job as a failure
-        if: "!success()"
         run: exit 1
 
-  rstar:
+    rstar:
     name: rstar
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
@@ -34,10 +49,10 @@ jobs:
       matrix:
         container_image:
           # Minimum supported rust version (MSRV)
-          - "georust/geo-ci:rust-1.63"
-          # Two most recent releases - we omit older ones for expedient CI
           - "georust/geo-ci:rust-1.65"
-          - "georust/geo-ci:rust-1.66"
+          # Two most recent releases - we omit older ones for expedient CI
+          - "georust/geo-ci:rust-1.71"
+          - "georust/geo-ci:rust-1.72"
     container:
       image: ${{ matrix.container_image }}
     steps: