Update bootstrap plans: 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.4, 9.8.1

And add the relevant CI jobs for these plans

Author: mpickering

.github/workflows/bootstrap.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ghc: ["8.10.7", "9.0.2", "9.2.7", "9.4.4"]
+        ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.8.1"]
         include:
           - os: macos-latest
             ghc: "9.2.7"

bootstrap/cabal-bootstrap-gen.cabal

@@ -11,7 +11,7 @@ executable cabal-bootstrap-gen
     , aeson                  ^>=1.5.2.0  || ^>=2.0.3.0 || ^>=2.1.0.0
     , base                   ^>=4.12.0.0 || ^>=4.13.0.0 || ^>=4.14.0.0 || ^>=4.15.0.0 || ^>=4.16.0.0 || ^>=4.17.0.0
     , bytestring             ^>=0.10.8.2 || ^>=0.11.0.0
-    , Cabal                  ^>=3.2.0.0  || ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.10.1.0
+    , Cabal                  ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.10.1.0
     , Cabal-syntax           ^>=3.10.1.0
     , cabal-install-parsers  ^>=0.3.0.1  || ^>=0.4.5 || ^>=0.6
     , cabal-plan             ^>=0.7.0.0

bootstrap/generate_bootstrap_plans

@@ -0,0 +1,23 @@
+nix build nixpkgs#jq.bin -o jq
+PATH+=:$PWD/jq-bin/bin
+
+ghcs_nix="https://gitlab.haskell.org/bgamari/ghcs-nix/-/archive/master/ghcs-nix-master.tar.gz"
+
+nix build -f "$ghcs_nix" ghc-8_10_7 -o boot_ghc
+
+run() {
+  local ver="$1"
+  local drv="ghc-$ver"
+  echo "$ver"
+  nix build -f "$ghcs_nix" $drv
+  (cd ../; rm -r dist-bootstrap; cabal --distdir=dist-bootstrap build --dry-run cabal-install:exe:cabal -w bootstrap/result/bin/ghc)
+  jq --sort-keys < ../dist-newstyle/cache/plan.json > "plan-$ver.json"
+  cabal run --with-ghc-pkg $PWD/boot_ghc/bin/ghc-pkg -w $PWD/boot_ghc/bin/ghc -v0 cabal-bootstrap-gen -- "plan-$ver.json" | jq --sort-keys | tee "linux-$(echo $ver | tr "_" ".").json"
+}
+
+run "8_10_7"
+run "9_0_2"
+run "9_2_8"
+run "9_4_8"
+run "9_6_4"
+run "9_8_1"