Merge pull request #7511 from haskell/wip/bump-3.6-into-.3.6

Bump Cabal to 3.6 and regenerate CI
haskell · Aug 5, 2021 · 26b99e3 · 26b99e3
2 parents 9270863 + ff6d146
commit 26b99e3
Show file tree

Hide file tree

Showing 34 changed files with 942 additions and 911 deletions.
diff --git a/.docker/validate-8.10.1.dockerfile → .docker/validate-8.10.4.dockerfile b/.docker/validate-8.10.1.dockerfile → .docker/validate-8.10.4.dockerfile
@@ -1,4 +1,4 @@
-FROM    phadej/ghc:8.10.1-bionic
+FROM    phadej/ghc:8.10.4-bionic
 
 # Install cabal-plan
 RUN     mkdir -p /root/.cabal/bin && \
@@ -24,7 +24,7 @@ RUN     cabal v2-install happy --constraint 'happy ^>=1.19.12'
 
 # Install some other dependencies
 # Remove $HOME/.ghc so there aren't any environments
-RUN     cabal v2-install -w ghc-8.10.1 --lib \
+RUN     cabal v2-install -w ghc-8.10.4 --lib \
           Cabal \
           aeson \
           async \
@@ -73,4 +73,4 @@ RUN     cabal v2-install -w ghc-8.10.1 --lib \
 # Validate
 WORKDIR /build
 COPY    . /build
-RUN     sh ./validate.sh  -w ghc-8.10.1 -v
+RUN     sh ./validate.sh  -w ghc-8.10.4 -v
diff --git a/.docker/validate-8.8.3.dockerfile → .docker/validate-8.8.4.dockerfile b/.docker/validate-8.8.3.dockerfile → .docker/validate-8.8.4.dockerfile
@@ -1,4 +1,4 @@
-FROM    phadej/ghc:8.8.3-bionic
+FROM    phadej/ghc:8.8.4-bionic
 
 # Install cabal-plan
 RUN     mkdir -p /root/.cabal/bin && \
@@ -24,7 +24,7 @@ RUN     cabal v2-install happy --constraint 'happy ^>=1.19.12'
 
 # Install some other dependencies
 # Remove $HOME/.ghc so there aren't any environments
-RUN     cabal v2-install -w ghc-8.8.3 --lib \
+RUN     cabal v2-install -w ghc-8.8.4 --lib \
           Cabal \
           aeson \
           async \
@@ -73,4 +73,4 @@ RUN     cabal v2-install -w ghc-8.8.3 --lib \
 # Validate
 WORKDIR /build
 COPY    . /build
-RUN     sh ./validate.sh --doctest --solver-benchmarks --complete-hackage -w ghc-8.8.3 -v
+RUN     sh ./validate.sh --doctest --solver-benchmarks --complete-hackage -w ghc-8.8.4 -v
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -18,7 +18,7 @@ jobs:
   validate-9_0_1:
     name: validate.sh ghc-9.0.1
     runs-on: ubuntu-18.04
-    needs: validate-8_8_3
+    needs: validate-8_8_4
     container:
       image: phadej/ghc:9.0.1-bionic
     steps:
@@ -57,12 +57,12 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -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_1:
-    name: validate.sh ghc-8.10.1
+  validate-8_10_4:
+    name: validate.sh ghc-8.10.4
     runs-on: ubuntu-18.04
-    needs: validate-8_8_3
+    needs: validate-8_8_4
     container:
-      image: phadej/ghc:8.10.1-bionic
+      image: phadej/ghc:8.10.4-bionic
     steps:
       - name: System info
         run: |
@@ -90,26 +90,26 @@ 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.1 -v  -s print-config
+        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-8.10.1 -v  -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s print-tool-versions
       - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.10.1 -v  -s make-cabal-install-dev
+        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s make-cabal-install-dev
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-8.10.1 -v  -s build
+        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-8.10.1 -v  -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-8.10.1 -v  -s lib-suite
+        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s lib-suite
       - name: Validate cli-tests
-        run: sh validate.sh -j 2 -w ghc-8.10.1 -v  -s cli-tests
+        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s cli-tests
       - name: Validate cli-suite
-        run: sh validate.sh -j 2 -w ghc-8.10.1 -v  -s cli-suite
-  validate-8_8_3:
-    name: validate.sh ghc-8.8.3
+        run: sh validate.sh -j 2 -w ghc-8.10.4 -v  -s cli-suite
+  validate-8_8_4:
+    name: validate.sh ghc-8.8.4
     runs-on: ubuntu-18.04
     container:
-      image: phadej/ghc:8.8.3-bionic
+      image: phadej/ghc:8.8.4-bionic
     steps:
       - name: System info
         run: |
@@ -137,25 +137,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-8.8.3 -v --solver-benchmarks -s print-config
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s print-tool-versions
       - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s make-cabal-install-dev
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s make-cabal-install-dev
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s build
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s lib-suite
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s lib-suite
       - name: Validate cli-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s cli-tests
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s cli-tests
       - name: Validate cli-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s cli-suite
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -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_3
+    needs: validate-8_8_4
     container:
       image: phadej/ghc:8.6.5-bionic
     steps:
@@ -203,7 +203,7 @@ jobs:
   validate-8_4_4:
     name: validate.sh ghc-8.4.4
     runs-on: ubuntu-18.04
-    needs: validate-8_8_3
+    needs: validate-8_8_4
     container:
       image: phadej/ghc:8.4.4-bionic
     steps:
@@ -251,7 +251,7 @@ jobs:
   validate-8_2_2:
     name: validate.sh ghc-8.2.2
     runs-on: ubuntu-18.04
-    needs: validate-8_8_3
+    needs: validate-8_8_4
     container:
       image: phadej/ghc:8.2.2-bionic
     steps:
@@ -299,7 +299,7 @@ jobs:
   validate-8_0_2:
     name: validate.sh ghc-8.0.2
     runs-on: ubuntu-18.04
-    needs: validate-8_8_3
+    needs: validate-8_8_4
     container:
       image: phadej/ghc:8.0.2-bionic
     steps:
@@ -347,7 +347,7 @@ jobs:
   validate-7_10_3:
     name: validate.sh ghc-7.10.3
     runs-on: ubuntu-18.04
-    needs: validate-8_8_3
+    needs: validate-8_8_4
     container:
       image: phadej/ghc:7.10.3-bionic
     steps:
@@ -395,7 +395,7 @@ jobs:
   validate-7_8_4:
     name: validate.sh ghc-7.8.4
     runs-on: ubuntu-18.04
-    needs: validate-8_8_3
+    needs: validate-8_8_4
     container:
       image: phadej/ghc:7.8.4-bionic
     steps:
@@ -437,7 +437,7 @@ jobs:
   validate-7_6_3:
     name: validate.sh ghc-7.6.3
     runs-on: ubuntu-18.04
-    needs: validate-8_8_3
+    needs: validate-8_8_4
     container:
       image: phadej/ghc:7.6.3-xenial
     steps:
@@ -480,12 +480,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_3-old:
+  validate-8_8_4-old:
     name: validate.sh old GHCs
     runs-on: ubuntu-18.04
-    needs: validate-8_8_3
+    needs: validate-8_8_4
     container:
-      image: phadej/ghc:8.8.3-xenial
+      image: phadej/ghc:8.8.4-xenial
     steps:
       - name: System info
         run: |
@@ -505,7 +505,7 @@ jobs:
       - name: apt-get update
         run: apt-get update
       - name: Install dynamic libraries
-        run: apt-get install -y ghc-8.8.3-dyn
+        run: apt-get install -y ghc-8.8.4-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
@@ -519,18 +519,18 @@ 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.8.3 -v --lib-only -s print-config
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s print-tool-versions
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s build
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-suite
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -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.3 -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.4 -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.3 -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.4 -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.3 -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.4 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.4.2/bin/ghc-7.4.2
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -15,8 +15,8 @@ on:
       - created
 
 jobs:
-  validate-macos-8_8_3:
-    name: validate.sh macos ghc-8.8.3
+  validate-macos-8_8_4:
+    name: validate.sh macos ghc-8.8.4
     runs-on: macos-latest
     steps:
       - name: System info
@@ -28,10 +28,10 @@ jobs:
       - name: Install GHC
         run: |
           cd $(mktemp -d)
-          curl -sLO https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-x86_64-apple-darwin.tar.xz
+          curl -sLO https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-apple-darwin.tar.xz
           tar -xJf ghc-*.tar.xz
           cd ghc-*
-          ./configure --prefix=/opt/ghc/8.8.3
+          ./configure --prefix=/opt/ghc/8.8.4
           sudo make install
       - name: Install Cabal
         run: |
@@ -43,7 +43,7 @@ jobs:
           sudo chmod 755 /opt/cabal/3.4/bin/cabal
       - name: Set PATH
         run: |
-          echo "/opt/ghc/8.8.3/bin" >> $GITHUB_PATH
+          echo "/opt/ghc/8.8.4/bin" >> $GITHUB_PATH
           echo "/opt/cabal/3.4/bin" >> $GITHUB_PATH
           echo "$HOME/.cabal/bin" >> $GITHUB_PATH
       - name: Update Hackage index
@@ -54,25 +54,25 @@ jobs:
           cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' --constraint='cabal-plan +exe'
       - uses: actions/checkout@v2
       - name: Validate print-config
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s print-config
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v  -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v  -s print-tool-versions
       - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s make-cabal-install-dev
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v  -s make-cabal-install-dev
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s build
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v  -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v  -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s lib-suite
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v  -s lib-suite
       - name: Validate cli-tests
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s cli-tests
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v  -s cli-tests
       - name: Validate cli-suite
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s cli-suite
+        run: sh validate.sh -j 2 -w ghc-8.8.4 -v  -s cli-suite
   validate-macos-8_6_5:
     name: validate.sh macos ghc-8.6.5
     runs-on: macos-latest
-    needs: validate-macos-8_8_3
+    needs: validate-macos-8_8_4
     steps:
       - name: System info
         run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -65,14 +65,14 @@ jobs:
           cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-tests
         # Using only one job, -j1, to fail less.
-        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe
-  test-windows-8_10_3:
-    name: test ghc-8.10.3
+        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe
+  test-windows-8_10_4:
+    name: test ghc-8.10.4
     runs-on: windows-latest
     steps:
       - uses: actions/setup-haskell@v1.1.4
         with:
-          ghc-version: '8.10.3'
+          ghc-version: '8.10.4'
           cabal-version: '3.2.0.0'
       - name: Print versions
         run: |
@@ -115,4 +115,4 @@ jobs:
           cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-tests
         # Using only one job, -j1, to fail less.
-        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.10.3\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe
+        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.10.4\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe
diff --git a/Cabal-QuickCheck/Cabal-QuickCheck.cabal b/Cabal-QuickCheck/Cabal-QuickCheck.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-QuickCheck
-version:       3.5.0.0
+version:       3.6.0.0
 synopsis:      QuickCheck instances for types in Cabal
 category:      Testing
 description:
@@ -13,7 +13,7 @@ library
   build-depends:
     , base
     , bytestring
-    , Cabal       ^>=3.5.0.0
+    , Cabal       ^>=3.6.0.0
     , QuickCheck  ^>=2.13.2 || ^>=2.14
 
   if !impl(ghc >= 8.0)

diff --git a/Cabal-described/Cabal-described.cabal b/Cabal-described/Cabal-described.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-described
-version:       3.5.0.0
+version:       3.6.0.0
 synopsis:      Described functionality for types in Cabal
 category:      Testing, Parsec
 description:   Provides rere bindings
@@ -11,7 +11,7 @@ library
   ghc-options:      -Wall
   build-depends:
     , base
-    , Cabal             ^>=3.5.0.0
+    , Cabal             ^>=3.6.0.0
     , containers
     , pretty
     , QuickCheck

diff --git a/Cabal-tests/Cabal-tests.cabal b/Cabal-tests/Cabal-tests.cabal
@@ -1,7 +1,7 @@
 cabal-version: >=1.10
 name:          Cabal-tests
 version:       3
-copyright:     2003-2020, Cabal Development Team (see AUTHORS file)
+copyright:     2003-2021, Cabal Development Team (see AUTHORS file)
 license:       BSD3
 license-file:  LICENSE
 author:        Cabal Development Team <cabal-devel@haskell.org>

diff --git a/Cabal-tree-diff/Cabal-tree-diff.cabal b/Cabal-tree-diff/Cabal-tree-diff.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-tree-diff
-version:       3.5.0.0
+version:       3.6.0.0
 synopsis:      QuickCheck instances for types in Cabal
 category:      Testing
 description:   Provides tree-diff ToExpr instances for some types in Cabal
@@ -11,7 +11,7 @@ library
   ghc-options:      -Wall
   build-depends:
     , base
-    , Cabal      ^>=3.5.0.0
+    , Cabal      ^>=3.6.0.0
     , tree-diff  ^>=0.1 || ^>=0.2
 
   exposed-modules:  Data.TreeDiff.Instances.Cabal