Use GHC-8.8.3 + checkout@v2

haskell · Mar 4, 2020 · 1495784 · 1495784
1 parent 89396ec
commit 1495784
Show file tree

Hide file tree

Showing 13 changed files with 140 additions and 126 deletions.
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -24,7 +24,7 @@ jobs:
           echo "::add-path::$HOME/.cabal/bin"
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Release project
         run: |
           cp cabal.project.release cabal.project
@@ -70,7 +70,7 @@ jobs:
           echo "::add-path::$HOME/.cabal/bin"
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Release project
         run: |
           cp cabal.project.release cabal.project
@@ -114,7 +114,7 @@ jobs:
           cabal user-config init -a "http-transport: plain-http" -a "store-dir: C:\SR" -f -v3
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Release project
         shell: bash
         run: |

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set PATH
         run: |
           echo "::add-path::/opt/ghc/8.6.5/bin"
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: bootstrap.sh
         env:
           EXTRA_CONFIGURE_OPTS: ""
@@ -52,7 +52,7 @@ jobs:
         run: |
           echo "::add-path::/opt/ghc/8.6.5/bin"
           echo "::add-path::$HOME/.cabal/bin"
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: bootstrap.sh
         env:
           EXTRA_CONFIGURE_OPTS: ""

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -18,11 +18,11 @@ on:
       - created
 
 jobs:
-  validate-8_8_2:
-    name: validate.sh ghc-8.8.2
+  validate-8_8_3:
+    name: validate.sh ghc-8.8.3
     runs-on: ubuntu-18.04
     container:
-      image: phadej/ghc:8.8.2-bionic
+      image: phadej/ghc:8.8.3-bionic
     steps:
       # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#add-a-system-path-add-path
       - name: Set PATH
@@ -38,64 +38,27 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Validate print-config
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s print-config
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s print-tool-versions
       - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s make-cabal-install-dev
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s make-cabal-install-dev
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s build
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s lib-suite
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s lib-suite
       - name: Validate cli-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s cli-tests
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s cli-tests
       - name: Validate cli-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s cli-suite
-  validate-8_8_1:
-    name: validate.sh ghc-8.8.1
-    runs-on: ubuntu-18.04
-    container:
-      image: phadej/ghc:8.8.1-bionic
-    steps:
-      # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#add-a-system-path-add-path
-      - name: Set PATH
-        run: |
-          echo "::add-path::$HOME/.cabal/bin"
-      - 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: Update Hackage index
-        run: cabal v2-update
-      - uses: actions/checkout@v1
-      - name: Validate print-config
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s print-config
-      - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s print-tool-versions
-      - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s make-cabal-install-dev
-      - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s build
-      - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s lib-tests
-      - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s lib-suite
-      - name: Validate cli-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s cli-tests
-      - name: Validate cli-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s cli-suite
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s cli-suite
   validate-8_6_5:
     name: validate.sh ghc-8.6.5
     runs-on: ubuntu-18.04
-    needs: validate-8_8_1
+    needs: validate-8_8_3
     container:
       image: phadej/ghc:8.6.5-bionic
     steps:
@@ -113,7 +76,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Validate print-config
         run: sh validate.sh -j 2 -w ghc-8.6.5 -v  -s print-config
       - name: Validate print-tool-versions
@@ -133,7 +96,7 @@ jobs:
   validate-8_4_4:
     name: validate.sh ghc-8.4.4
     runs-on: ubuntu-18.04
-    needs: validate-8_8_1
+    needs: validate-8_8_3
     container:
       image: phadej/ghc:8.4.4-bionic
     steps:
@@ -151,7 +114,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Validate print-config
         run: sh validate.sh -j 2 -w ghc-8.4.4 -v  -s print-config
       - name: Validate print-tool-versions
@@ -171,7 +134,7 @@ jobs:
   validate-8_2_2:
     name: validate.sh ghc-8.2.2
     runs-on: ubuntu-18.04
-    needs: validate-8_8_1
+    needs: validate-8_8_3
     container:
       image: phadej/ghc:8.2.2-bionic
     steps:
@@ -189,7 +152,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Validate print-config
         run: sh validate.sh -j 2 -w ghc-8.2.2 -v  -s print-config
       - name: Validate print-tool-versions
@@ -209,7 +172,7 @@ jobs:
   validate-8_0_2:
     name: validate.sh ghc-8.0.2
     runs-on: ubuntu-18.04
-    needs: validate-8_8_1
+    needs: validate-8_8_3
     container:
       image: phadej/ghc:8.0.2-bionic
     steps:
@@ -227,7 +190,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Validate print-config
         run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s print-config
       - name: Validate print-tool-versions
@@ -247,7 +210,7 @@ jobs:
   validate-7_10_3:
     name: validate.sh ghc-7.10.3
     runs-on: ubuntu-18.04
-    needs: validate-8_8_1
+    needs: validate-8_8_3
     container:
       image: phadej/ghc:7.10.3-bionic
     steps:
@@ -265,7 +228,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Validate print-config
         run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s print-config
       - name: Validate print-tool-versions
@@ -285,7 +248,7 @@ jobs:
   validate-7_8_4:
     name: validate.sh ghc-7.8.4
     runs-on: ubuntu-18.04
-    needs: validate-8_8_1
+    needs: validate-8_8_3
     container:
       image: phadej/ghc:7.8.4-bionic
     steps:
@@ -303,7 +266,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Validate print-config
         run: sh validate.sh -j 2 -w ghc-7.8.4 -v --lib-only -s print-config
       - name: Validate print-tool-versions
@@ -317,7 +280,7 @@ jobs:
   validate-7_6_3:
     name: validate.sh ghc-7.6.3
     runs-on: ubuntu-18.04
-    needs: validate-8_8_1
+    needs: validate-8_8_3
     container:
       image: phadej/ghc:7.6.3-xenial
     steps:
@@ -339,7 +302,7 @@ jobs:
         run: apt-get install -y ghc-7.6.3-dyn
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Validate print-config
         run: sh validate.sh -j 2 -w ghc-7.6.3 -v --lib-only -s print-config
       - name: Validate print-tool-versions
@@ -350,12 +313,12 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-7.6.3 -v --lib-only -s lib-tests
       - name: Validate lib-suite
         run: sh validate.sh -j 2 -w ghc-7.6.3 -v --lib-only -s lib-suite
-  validate-8_8_1-old:
+  validate-8_8_3-old:
     name: validate.sh old GHCs
     runs-on: ubuntu-18.04
-    needs: validate-8_8_1
+    needs: validate-8_8_3
     container:
-      image: phadej/ghc:8.8.1-xenial
+      image: phadej/ghc:8.8.3-xenial
     steps:
       # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#add-a-system-path-add-path
       - name: Set PATH
@@ -372,25 +335,25 @@ jobs:
       - name: apt-get update
         run: apt-get update
       - name: Install dynamic libraries
-        run: apt-get install -y ghc-8.8.1-dyn
+        run: apt-get install -y ghc-8.8.3-dyn
       - name: Install extra compilers
         run: apt-get install -y ghc-7.0.4-dyn ghc-7.2.2-dyn ghc-7.4.2-dyn
       - name: Update Hackage index
         run: cabal v2-update
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Validate print-config
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s print-config
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s print-tool-versions
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s build
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s lib-suite
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-suite
       - name: Validate lib-suite-extras --extra-hc /opt/ghc/7.0.4/bin/ghc-7.0.4
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.0.4/bin/ghc-7.0.4
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.0.4/bin/ghc-7.0.4
       - name: Validate lib-suite-extras --extra-hc /opt/ghc/7.2.2/bin/ghc-7.2.2
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.2.2/bin/ghc-7.2.2
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.2.2/bin/ghc-7.2.2
       - name: Validate lib-suite-extras --extra-hc /opt/ghc/7.4.2/bin/ghc-7.4.2
-        run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.4.2/bin/ghc-7.4.2
+        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.4.2/bin/ghc-7.4.2