Add 9.2 CI job and update older ones

haskell · Jan 27, 2022 · 3ea1bdf · 3ea1bdf
1 parent 10ee23d
commit 3ea1bdf
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 20 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -15,12 +15,12 @@ on:
       - created
 
 jobs:
-  validate-9_0_1:
-    name: validate.sh ghc-9.0.1
+  validate-9_2_1:
+    name: validate.sh ghc-9.2.1
     runs-on: ubuntu-18.04
     needs: validate-8_8_4
     container:
-      image: phadej/ghc:9.0.1-bionic
+      image: phadej/ghc:9.2.1-bionic
     steps:
       - name: System info
         run: |
@@ -37,6 +37,60 @@ jobs:
           xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
           rm -f cabal-plan.xz
           chmod a+x $HOME/.cabal/bin/cabal-plan
+      - name: apt-get update
+        run: apt-get update
+      - name: Install `nroff` for `cabal man`
+        run: apt-get install -y groff-base
+      - name: Update Hackage index
+        run: cabal v2-update
+      # https://github.com/actions/checkout/issues/170
+      # - uses: actions/checkout@v2
+      - name: Checkout
+        run: |
+          echo $GITHUB_REF $GITHUB_SHA
+          git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
+          git fetch origin $GITHUB_SHA:temporary-ci-branch
+          git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
+      - name: Validate print-config
+        run: sh validate.sh -j 2 -w ghc-9.2.1 -v  -s print-config
+      - name: Validate print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-9.2.1 -v  -s print-tool-versions
+      - name: Validate build
+        run: sh validate.sh -j 2 -w ghc-9.2.1 -v  -s build
+      - name: Validate lib-tests
+        run: sh validate.sh -j 2 -w ghc-9.2.1 -v  -s lib-tests
+      - name: Validate lib-suite
+        run: sh validate.sh -j 2 -w ghc-9.2.1 -v  -s lib-suite
+      - name: Validate cli-tests
+        run: sh validate.sh -j 2 -w ghc-9.2.1 -v  -s cli-tests
+      - name: Validate cli-suite
+        run: sh validate.sh -j 2 -w ghc-9.2.1 -v  -s cli-suite
+  validate-9_0_2:
+    name: validate.sh ghc-9.0.2
+    runs-on: ubuntu-18.04
+    needs: validate-8_8_4
+    container:
+      image: phadej/ghc:9.0.2-bionic
+    steps:
+      - name: System info
+        run: |
+          uname -a
+      - name: Set PATH
+        # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#adding-a-system-path
+        run: |
+          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
+      - name: Install cabal-plan
+        run: |
+          mkdir -p $HOME/.cabal/bin
+          curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
+          echo "de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc  cabal-plan.xz" | sha256sum -c -
+          xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
+          rm -f cabal-plan.xz
+          chmod a+x $HOME/.cabal/bin/cabal-plan
+      - name: apt-get update
+        run: apt-get update
+      - name: Install `nroff` for `cabal man`
+        run: apt-get install -y groff-base
       - name: Update Hackage index
         run: cabal v2-update
       # https://github.com/actions/checkout/issues/170
@@ -48,21 +102,25 @@ jobs:
           git fetch origin $GITHUB_SHA:temporary-ci-branch
           git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
       - name: Validate print-config
-        run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s print-config
+        run: sh validate.sh -j 2 -w ghc-9.0.2 -v  -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-9.0.2 -v  -s print-tool-versions
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s build
+        run: sh validate.sh -j 2 -w ghc-9.0.2 -v  -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-9.0.2 -v  -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s lib-suite
-  validate-8_10_4:
-    name: validate.sh ghc-8.10.4
+        run: sh validate.sh -j 2 -w ghc-9.0.2 -v  -s lib-suite
+      - name: Validate cli-tests
+        run: sh validate.sh -j 2 -w ghc-9.0.2 -v  -s cli-tests
+      - name: Validate cli-suite
+        run: sh validate.sh -j 2 -w ghc-9.0.2 -v  -s cli-suite
+  validate-8_10_7:
+    name: validate.sh ghc-8.10.7
     runs-on: ubuntu-18.04
     needs: validate-8_8_4
     container:
-      image: phadej/ghc:8.10.4-bionic
+      image: phadej/ghc:8.10.7-bionic
     steps:
       - name: System info
         run: |
@@ -94,19 +152,19 @@ jobs:
           git fetch origin $GITHUB_SHA:temporary-ci-branch
           git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
       - name: Validate print-config
-        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s print-config
+        run: sh validate.sh -j 2 -w ghc-8.10.7 -v  -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-8.10.7 -v  -s print-tool-versions
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s build
+        run: sh validate.sh -j 2 -w ghc-8.10.7 -v  -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-8.10.7 -v  -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s lib-suite
+        run: sh validate.sh -j 2 -w ghc-8.10.7 -v  -s lib-suite
       - name: Validate cli-tests
-        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s cli-tests
+        run: sh validate.sh -j 2 -w ghc-8.10.7 -v  -s cli-tests
       - name: Validate cli-suite
-        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s cli-suite
+        run: sh validate.sh -j 2 -w ghc-8.10.7 -v  -s cli-suite
   validate-8_8_4:
     name: validate.sh ghc-8.8.4
     runs-on: ubuntu-18.04

diff --git a/cabal-dev-scripts/src/GenValidate.hs b/cabal-dev-scripts/src/GenValidate.hs
@@ -23,8 +23,9 @@ main = do
             w <- run Z
                 { zJobs = -- version xenial flags                       old   needs     steps
                           -------------------------------------------------------------------
-                    [ GhcJob "9.0.1"  False "--lib-only"                False ["8.8.4"] libSteps
-                    , GhcJob "8.10.4" False ""                          False ["8.8.4"] defSteps
+                    [ GhcJob "9.2.1"  False ""                          False ["8.8.4"] defSteps
+                    , GhcJob "9.0.2"  False ""                          False ["8.8.4"] defSteps
+                    , GhcJob "8.10.7" False ""                          False ["8.8.4"] defSteps
                     , GhcJob "8.8.4"  False "--solver-benchmarks"       False []        defSteps
                     , GhcJob "8.6.5"  False "--complete-hackage-tests"  False ["8.8.4"] defSteps
                     , GhcJob "8.4.4"  False ""                          False ["8.8.4"] defSteps