Preflight checks 3.16 (backport #11275)

.github/workflows/bootstrap.yml

@@ -5,22 +5,11 @@ concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
-# Note: This workflow file contains the required job "Bootstrap post job". We are using path filtering
-# here to ignore PRs which only change documentation. This can cause a problem, see the workflow file
-# "bootstrap.skip.yml" for a description of the problem and the solution provided in that file.
 on:
   push:
-    paths-ignore:
-      - 'doc/**'
-      - '**/README.md'
-      - 'CONTRIBUTING.md'
     branches:
       - master
   pull_request:
-    paths-ignore:
-      - 'doc/**'
-      - '**/README.md'
-      - 'CONTRIBUTING.md'
   release:
     types:
       - created
@@ -43,7 +32,7 @@ jobs:
           rm -rf ~/.config/cabal
           rm -rf ~/.cache/cabal
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Cache the downloads
         id: bootstrap-cache
         with:

.github/workflows/check-sdist.yml

@@ -7,17 +7,9 @@ concurrency:
 
 on:
   push:
-    paths-ignore:
-      - "doc/**"
-      - "**/README.md"
-      - "CONTRIBUTING.md"
     branches:
       - master
   pull_request:
-    paths-ignore:
-      - "doc/**"
-      - "**/README.md"
-      - "CONTRIBUTING.md"
   release:
     types:
       - created
@@ -28,23 +20,17 @@ jobs:
   # No caching, since the point is to verify they can be installed "from scratch"
   # Don't run on master or a PR targeting master, because there's never an installable Cabal
   dogfood-sdists:
-    name: Dogfood sdist on ${{ matrix.os }} ghc-${{ matrix.ghc }}
+    name: Dogfood sdist on ghc-${{ matrix.ghc }}
     if: github.ref != 'refs/heads/master' && github.base_ref != 'master'
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest]
         # this should be kept up to date with the list in validate.yml, but should be the
         # *first* compiler release so we validate against what is hopefully the first
         # release of a corresponding Cabal and friends. it can also be short since it's
         # highly unlikely that we are releasing really old branches.
         ghc:
-          [
-            "9.10.1",
-            "9.8.1",
-            "9.6.1",
-            "9.4.1",
-          ]
+          ["9.10.1", "9.8.1", "9.6.1"]
 
     steps:
 
@@ -68,9 +54,9 @@ jobs:
           # (don't look at this too closely)
           sdist="$(ls dist-newstyle/sdist/cabal-install-*.tar.gz | sed -n '\,^dist-newstyle/sdist/cabal-install-[0-9.]*\.tar\.gz$,{;p;q;}')"
           # extract the cabal-install major version
-          ver="$(echo "$sdist" | sed -n 's,^dist-newstyle/sdist/cabal-install-\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9.]*$,\1,p')"
+          ver="$(echo "$sdist" | sed -n 's,^dist-newstyle/sdist/cabal-install-\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9.]*\.tar\.gz$,\1,p')"
           # dunno if this will ever be extended to freebsd, but grep -q is a gnu-ism
-          if ghc-pkg --global --simple-output list Cabal | grep "^Cabal-$cbl\\." >/dev/null; then
+          if ghc-pkg --global --simple-output list Cabal | grep "^Cabal-$ver\\." >/dev/null; then
             # sigh, someone broke installing from tarballs
             rm -rf cabal*.project Cabal Cabal-syntax cabal-install-solver cabal-install
             tar xfz "$sdist"
@@ -80,3 +66,17 @@ jobs:
             echo No matching bootlib Cabal version to test against.
             exit 0
           fi
+
+  check-sdist-post-job:
+    if: always()
+    name: Check sdist post job
+    runs-on: ubuntu-latest
+    # IMPORTANT! Any job added to the workflow should be added here too
+    needs: [dogfood-sdists]
+
+    steps:
+      - run: |
+          echo "jobs info: ${{ toJSON(needs) }}"
+      - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
+        run: exit 1
+