ci: merge-queue support and a leaner pipeline

alandefreitas · alandefreitas · commit f942a24de24b · 2026-06-12T10:31:33.000-05:00
With golden fixtures no longer drifting across three formats on every
change, the pipeline can run the full test set on every build and a
rebasing merge queue becomes practical: the queue can rebase a PR onto
the current tip and re-test it without the expected outputs churning.

All actions are also bumped to their latest releases (cpp-actions to
v1.9.5 and the GitHub-maintained actions to their node24 versions) so
the runner no longer warns about the deprecated node20 runtime.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -35,29 +35,29 @@ jobs:
     env: ${{ matrix.env }}
     steps:
       - name: Container Bootstrap
-        uses: alandefreitas/cpp-actions/container-bootstrap@v1.9.4
+        uses: alandefreitas/cpp-actions/container-bootstrap@v1.9.5
 
       - name: Setup C++
-        uses: alandefreitas/cpp-actions/setup-cpp@v1.9.4
+        uses: alandefreitas/cpp-actions/setup-cpp@v1.9.5
         id: setup-cpp
         with:
           compiler: ${{ matrix.compiler }}
           version: ${{ matrix.version }}
 
       - name: Install System Packages
-        uses: alandefreitas/cpp-actions/package-install@v1.9.4
+        uses: alandefreitas/cpp-actions/package-install@v1.9.5
         id: package-install
         with:
           packages: ${{ matrix.install }}
           apt-get-source-keys: ${{ matrix.coverage && 'https://apt.llvm.org/llvm-snapshot.gpg.key' || '' }}
           apt-get-sources: ${{ matrix.coverage && 'deb https://apt.llvm.org/noble/ llvm-toolchain-noble-21 main' || '' }}
 
       - name: Clone MrDocs
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Restore LLVM Cache
         id: llvm-cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: build/third-party/install/llvm
           key: ${{ matrix.llvm-cache-key }}
@@ -111,13 +111,13 @@ jobs:
           contains(env.BOOTSTRAP_REBUILT, 'llvm')
           && (github.event_name != 'pull_request'
               || github.event.pull_request.head.repo.full_name == github.repository)
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         with:
           path: build/third-party/install/llvm
           key: ${{ matrix.llvm-cache-key }}
 
       - name: CMake Workflow
-        uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.4
+        uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.5
         with:
           cmake-version: '>=3.26'
           cxxstd: ${{ matrix.cxxstd }}
@@ -129,7 +129,6 @@ jobs:
           generator: Ninja
           build-type: ${{ matrix.build-type }}
           install-prefix: .local
-          extra-args: -D MRDOCS_EXPENSIVE_TESTS=${{ matrix.is-bottleneck && 'OFF' || 'ON' }}
           export-compile-commands: true
           run-tests: true
           install: true
@@ -142,7 +141,7 @@ jobs:
       # Upload packages for ci-releases.yml to pick up
       - name: Upload GitHub Release Artifacts
         if: matrix.is-release-build == 'true'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ matrix.mrdocs-release-package-artifact }}
           path: |
@@ -151,7 +150,7 @@ jobs:
           retention-days: 1
 
       - name: FlameGraph
-        uses: alandefreitas/cpp-actions/flamegraph@v1.9.4
+        uses: alandefreitas/cpp-actions/flamegraph@v1.9.5
         if: matrix.time-trace
         with:
           build-dir: build
@@ -160,7 +159,7 @@ jobs:
       - name: Process Coverage
         id: process-coverage
         if: matrix.coverage
-        uses: alandefreitas/cpp-actions/process-coverage@v1.9.4
+        uses: alandefreitas/cpp-actions/process-coverage@v1.9.5
         with:
           cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx }}
           build-dir: build
@@ -177,7 +176,7 @@ jobs:
           github.event_name == 'push' &&
           github.ref_name == 'develop' &&
           steps.process-coverage.outputs.lcov-file != ''
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: coverage-develop
           path: ${{ steps.process-coverage.outputs.lcov-file }}
diff --git a/.github/workflows/ci-documentation.yml b/.github/workflows/ci-documentation.yml
@@ -45,25 +45,25 @@ jobs:
       contents: read
     steps:
       - name: Container Bootstrap
-        uses: alandefreitas/cpp-actions/container-bootstrap@v1.9.4
+        uses: alandefreitas/cpp-actions/container-bootstrap@v1.9.5
 
       - name: Install packages
-        uses: alandefreitas/cpp-actions/package-install@v1.9.4
+        uses: alandefreitas/cpp-actions/package-install@v1.9.5
         with:
           apt-get: build-essential asciidoctor cmake bzip2 git rsync
 
       - name: Clone MrDocs
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
 
       - name: Install Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '20'
 
       - name: Setup C++
-        uses: alandefreitas/cpp-actions/setup-cpp@v1.9.4
+        uses: alandefreitas/cpp-actions/setup-cpp@v1.9.5
         id: setup-cpp
         with:
           compiler: ${{ matrix.compiler }}
@@ -73,7 +73,7 @@ jobs:
       # when we built this run, develop-release fallback otherwise.
       - name: Download MrDocs package (fresh build)
         if: ${{ !inputs.use-develop-binaries }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: ${{ matrix.mrdocs-release-package-artifact }}
           path: packages
@@ -128,7 +128,7 @@ jobs:
           cp -vr build/site/* ../build/docs-local
 
       - name: Upload Website as Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: Website ${{ runner.os }}
           path: build/website
diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml
@@ -31,7 +31,7 @@ jobs:
       submatrices: ${{ steps.cpp-matrix.outputs.submatrices }}
     steps:
       - name: Generate Test Matrix
-        uses: alandefreitas/cpp-actions/cpp-matrix@v1.9.4
+        uses: alandefreitas/cpp-actions/cpp-matrix@v1.9.5
         id: cpp-matrix
         with:
           compilers: |
@@ -110,14 +110,10 @@ jobs:
             mrdocs-package-generators: {{select (ieq os 'windows') "7Z ZIP WIX" "TGZ TXZ"}}
             mrdocs-release-package-artifact: release-packages-{{{ lowercase os }}}
 
-            # Bottleneck builds: skip expensive tests that ended up being redundant to save CI time
-            is-bottleneck: {{#if (or msan (and (ieq compiler 'apple-clang') (or asan ubsan))) }}true{{/if}}
-
           submatrices: |
             releases: {{ieq is-release-build 'true'}}
             # `coverage` is a raw boolean factor (undefined on non-Coverage rows),
-            # so `ieq` would crash. Wrap in `#if` like the `is-bottleneck` extra-value
-            # above to handle undefined cleanly.
+            # so `ieq` would crash. Wrap in `#if` to handle the undefined case cleanly.
             coverage: {{#if coverage}}true{{/if}}
             releases-and-coverage: {{#if (or (ieq is-release-build 'true') coverage)}}true{{/if}}
           trace-commands: true
diff --git a/.github/workflows/ci-publish.yml b/.github/workflows/ci-publish.yml
@@ -87,41 +87,41 @@ jobs:
 
       - name: Install packages
         if: inputs.should-publish
-        uses: alandefreitas/cpp-actions/package-install@v1.9.4
+        uses: alandefreitas/cpp-actions/package-install@v1.9.5
         with:
           apt-get: rsync git
 
       - name: Clone MrDocs
         if: inputs.should-publish
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           fetch-tags: true
 
       - name: Install Node.js
         if: inputs.should-publish
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '20'
 
       - name: Download all platform packages
         if: inputs.should-publish
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: release-packages-*
           path: packages
           merge-multiple: true
 
       - name: Download website (Linux)
         if: inputs.should-publish
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: Website Linux
           path: build/website
 
       - name: Download demos (Linux)
         if: inputs.should-publish
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: demos${{ (contains(fromJSON('["master", "develop"]'), github.ref_name) && format('-{0}', github.ref_name)) || '' }}-Linux
           path: .
@@ -175,7 +175,7 @@ jobs:
       - name: Download previous demos (tags only)
         if: inputs.should-publish && startsWith(github.ref, 'refs/tags/')
         id: download-prev-demos
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         continue-on-error: true
         with:
           name: demos-develop-Linux
@@ -188,15 +188,15 @@ jobs:
 
       - name: Upload demo diff (tags only)
         if: inputs.should-publish && startsWith(github.ref, 'refs/tags/') && steps.compare-demos.outputs.diff == 'true'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: demos-diff
           path: demos-diff
           retention-days: 30
 
       - name: Publish website to GitHub Pages
         if: inputs.should-publish
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: build/website
@@ -225,7 +225,7 @@ jobs:
 
       - name: Create changelog
         if: inputs.should-publish
-        uses: alandefreitas/cpp-actions/create-changelog@v1.9.4
+        uses: alandefreitas/cpp-actions/create-changelog@v1.9.5
         with:
           output-path: CHANGELOG.md
           thank-non-regular: ${{ startsWith(github.ref, 'refs/tags/') }}
@@ -251,7 +251,7 @@ jobs:
 
       - name: Create consolidated GitHub Release
         if: inputs.should-publish
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           files: packages/MrDocs-*-*.*
           fail_on_unmatched_files: true
diff --git a/.github/workflows/ci-releases.yml b/.github/workflows/ci-releases.yml
@@ -44,29 +44,29 @@ jobs:
       contents: read
     steps:
       - name: Container Bootstrap
-        uses: alandefreitas/cpp-actions/container-bootstrap@v1.9.4
+        uses: alandefreitas/cpp-actions/container-bootstrap@v1.9.5
 
       - name: Install packages
-        uses: alandefreitas/cpp-actions/package-install@v1.9.4
+        uses: alandefreitas/cpp-actions/package-install@v1.9.5
         with:
           apt-get: build-essential asciidoctor cmake bzip2 git rsync
 
       - name: Clone MrDocs
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
 
       - name: Install Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '20'
 
       - name: Setup Ninja
         if: runner.os == 'Windows'
-        uses: seanmiddleditch/gha-setup-ninja@v5
+        uses: seanmiddleditch/gha-setup-ninja@v6
 
       - name: Setup C++
-        uses: alandefreitas/cpp-actions/setup-cpp@v1.9.4
+        uses: alandefreitas/cpp-actions/setup-cpp@v1.9.5
         id: setup-cpp
         with:
           compiler: ${{ matrix.compiler }}
@@ -78,7 +78,7 @@ jobs:
       # this when it verified the cache is warm.
       - name: Download MrDocs package (fresh build)
         if: ${{ !inputs.use-develop-binaries }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: ${{ matrix.mrdocs-release-package-artifact }}
           path: packages
@@ -102,7 +102,7 @@ jobs:
         run: .github/scripts/install-mrdocs-package.sh
 
       - name: Clone Boost.URL
-        uses: alandefreitas/cpp-actions/boost-clone@v1.9.4
+        uses: alandefreitas/cpp-actions/boost-clone@v1.9.5
         with:
           branch: develop
           modules: url
@@ -112,28 +112,28 @@ jobs:
           trace-commands: true
 
       - name: Clone Beman.Optional
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: steve-downey/optional
           ref: main
           path: beman-optional
 
       - name: Clone Fmt
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: fmtlib/fmt
           ref: main
           path: fmt
 
       - name: Clone Nlohmann.Json
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: nlohmann/json
           ref: develop
           path: nlohmann-json
 
       - name: Clone MpUnits
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: mpusz/mp-units
           ref: master
@@ -155,7 +155,7 @@ jobs:
         run: .github/scripts/generate-demos.sh
 
       - name: Upload Demos as Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: demos${{ (contains(fromJSON('["master", "develop"]'), github.ref_name) && format('-{0}', github.ref_name)) || '' }}-${{ runner.os }}
           path: demos.tar.gz
diff --git a/.github/workflows/ci-scope-detector.yml b/.github/workflows/ci-scope-detector.yml
@@ -81,12 +81,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '20'
 
@@ -99,6 +99,7 @@ jobs:
         env:
           GITHUB_EVENT_NAME: ${{ github.event_name }}
           BASE_REF: ${{ github.base_ref }}
+          MERGE_GROUP_BASE_SHA: ${{ github.event.merge_group.base_sha }}
           PR_BODY: ${{ github.event.pull_request.body }}
           PR_LABELS: ${{ toJSON(github.event.pull_request.labels.*.name) }}
         run: |
@@ -117,6 +118,14 @@ jobs:
           if [[ "$GITHUB_EVENT_NAME" == 'pull_request' ]]; then
             merge_base=$(git merge-base "origin/$BASE_REF" HEAD)
             git diff --name-only "$merge_base" HEAD > changed-files.txt
+          elif [[ "$GITHUB_EVENT_NAME" == 'merge_group' ]]; then
+            # The queue tests the speculative commit (HEAD = the queued PR(s)
+            # rebased on top of everything ahead of them in the queue). Diff
+            # against the base the group was cut from so the same code/non-code
+            # scope rules apply here as on the PR itself: a code-touching queue
+            # entry runs the full matrix, a docs-only one stays reduced.
+            merge_base="$MERGE_GROUP_BASE_SHA"
+            git diff --name-only "$merge_base" HEAD > changed-files.txt
           else
             merge_base="$(git rev-parse HEAD)"
             : > changed-files.txt
diff --git a/.github/workflows/ci-utility-tests.yml b/.github/workflows/ci-utility-tests.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/pr-target-checks.yml b/.github/workflows/pr-target-checks.yml
