Merge pull request #1921 from Kobzol/ci-merge-queue

Switch CI to use a merge queue

Author: marcoieni

.github/workflows/ci.yml

@@ -1,23 +1,12 @@
 name: CI
 on:
-  push: {}
-  pull_request: {}
-  schedule:
-    - cron: "0 12 * * 1" # Every Monday at 12:00 UTC
+  pull_request:
+  merge_group:
 
 env:
   AWS_ACCESS_KEY_ID: AKIA46X5W6CZEAQSMRH7
 
 jobs:
-  rustfmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-    - name: Install Rust
-      run: rustup update stable && rustup default stable && rustup component add rustfmt
-    - run: cargo fmt --all --check
-
   test:
     name: Test
     runs-on: ubuntu-latest
@@ -38,15 +27,16 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - name: Run tests
         run: cargo test --workspace --all-targets
+      - name: Check formatting
+        run: cargo fmt --all --check
 
-  ci:
-    name: CI
+  deploy:
+    name: Deploy
     runs-on: ubuntu-latest
+    if: github.event_name == 'merge_group'
     steps:
       - name: Checkout the source code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
+        uses: actions/checkout@v4
 
       - name: Test and build
         run: docker build -t triagebot .
@@ -61,4 +51,22 @@ jobs:
           redeploy_ecs_service: triagebot
           aws_access_key_id: "${{ env.AWS_ACCESS_KEY_ID }}"
           aws_secret_access_key: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
-        if: github.ref == 'refs/heads/master'
+
+  # Summary job for the merge queue.
+  # ALL THE PREVIOUS JOBS NEED TO BE ADDED TO THE `needs` SECTION OF THIS JOB!
+  ci:
+    needs: [ test, deploy ]
+    # We need to ensure this job does *not* get skipped if its dependencies fail,
+    # because a skipped job is considered a success by GitHub. So we have to
+    # overwrite `if:`. We use `!cancelled()` to ensure the job does still not get run
+    # when the workflow is canceled manually.
+    if: ${{ !cancelled() }}
+    runs-on: ubuntu-latest
+    steps:
+      # Manually check the status of all dependencies. `if: failure()` does not work.
+      - name: Conclusion
+        run: |
+          # Print the dependent jobs to see them in the CI log
+          jq -C <<< '${{ toJson(needs) }}'
+          # Check if all jobs that we depend on (in the needs array) were successful.
+          jq --exit-status 'all(.result == "success" or .result == "skipped")' <<< '${{ toJson(needs) }}'