Merge branch 'master' into check-cfg-enable-without

Author: Amanieu

.github/workflows/main.yml

@@ -1,12 +1,7 @@
 name: CI
 on:
-  push:
-    branches:
-    - auto
-    - try
   pull_request:
-    branches:
-    - master
+  merge_group:
 
 jobs:
   style:
@@ -29,14 +24,6 @@ jobs:
     - run: ci/dox.sh
       env:
         CI: 1
-    - name: Publish documentation
-      run: |
-        cd target/doc
-        git init
-        git add .
-        git -c user.name='ci' -c user.email='ci' commit -m init
-        git push -f -q https://git:${{ secrets.github_token }}@github.com/${{ github.repository }} HEAD:gh-pages
-      if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
 
   verify:
     name: Automatic intrinsic verification
@@ -246,19 +233,25 @@ jobs:
       run: rustup update nightly && rustup default nightly
     - run: ./ci/build-std-detect.sh
 
-  success:
+  conclusion:
     needs:
       - docs
       - verify
       - env_override
       - test
       - build-std-detect
     runs-on: ubuntu-latest
-    # GitHub branch protection is exceedingly silly and treats "jobs skipped because a dependency
-    # failed" as success. So we have to do some contortions to ensure the job fails if any of its
-    # dependencies fails.
-    if: always() # make sure this is never "skipped"
+    # 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.
+    #
+    # ALL THE PREVIOUS JOBS NEED TO BE ADDED TO THE `needs` SECTION OF THIS JOB!
+    if: ${{ !cancelled() }} # make sure this is never "skipped"
     steps:
-      # Manually check the status of all dependencies. `if: failure()` does not work.
-      - name: check if any dependency failed
-        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
+      - 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")' <<< '${{ toJson(needs) }}'