haskell · mergify · Mar 13, 2023
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
@@ -19,10 +19,17 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+<<<<<<< HEAD
         ghc: ["8.10.7", "9.0.2", "9.2.6", "9.4.4"]
         include:
           - os: macos-latest
             ghc: "9.2.6"
+=======
+        ghc: ["8.10.7", "9.0.2", "9.2.7", "9.4.4"]
+        include:
+          - os: macos-latest
+            ghc: "9.2.7"
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
     name: Bootstrap ${{ matrix.os }} ghc-${{ matrix.ghc }}
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -57,6 +57,20 @@ jobs:
 
       - uses: actions/checkout@v3
 
+      #  See the following link for a breakdown of the following step
+      #  https://github.com/haskell/actions/issues/7#issuecomment-745697160
+      #
+      # See https://github.com/haskell/cabal/pull/8739 for why Windows is excluded
+      - if: ${{ runner.os != 'Windows' }}
+        uses: actions/cache@v3
+        with:
+          # validate.sh uses a special build dir
+          path: |
+            ${{ steps.setup-haskell.outputs.cabal-store }}
+            dist-*
+          key: ${{ runner.os }}-${{ matrix.ghc }}-20220419-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-20220419-
+
       # See https://github.com/haskell/cabal/pull/8739
       - name: Sudo chmod to permit ghcup to update its cache
         run: |
@@ -71,21 +85,7 @@ jobs:
         id: setup-haskell
         with:
           ghc-version: ${{ matrix.ghc }}
-          cabal-version: '3.8.1.0'
-
-      #  See the following link for a breakdown of the following step
-      #  https://github.com/haskell/actions/issues/7#issuecomment-745697160
-      #
-      # See https://github.com/haskell/cabal/pull/8739 for why Windows is excluded
-      - if: ${{ runner.os != 'Windows' }}
-        uses: actions/cache@v3
-        with:
-          # validate.sh uses a special build dir
-          path: |
-            ${{ steps.setup-haskell.outputs.cabal-store }}
-            dist-*
-          key: ${{ runner.os }}-${{ matrix.ghc }}-20220419-${{ github.sha }}
-          restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-20220419-
+          cabal-version: '3.10.1.0'
 
       - name: Work around git problem https://bugs.launchpad.net/ubuntu/+source/git/+bug/1993586 (cabal PR #8546)
         run: |
@@ -98,7 +98,7 @@ jobs:
         run: |
           cd $(mktemp -d)
           cabal install cabal-plan --constraint='cabal-plan +exe'
-          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
+          echo "$HOME/.cabal/bin:$HOME/.local/bin" >> $GITHUB_PATH
 
       # The tool is not essential to the rest of the test suite. If
       # hackage-repo-tool is not present, any test that requires it will
@@ -206,6 +206,20 @@ jobs:
 
       - uses: actions/checkout@v3
 
+      #  See the following link for a breakdown of the following step
+      #  https://github.com/haskell/actions/issues/7#issuecomment-745697160
+      #
+      # See https://github.com/haskell/cabal/pull/8739 for why Windows is excluded
+      - if: ${{ runner.os != 'Windows' }}
+        uses: actions/cache@v3
+        with:
+          # validate.sh uses a special build dir
+          path: |
+            ${{ steps.setup-haskell.outputs.cabal-store }}
+            dist-*
+          key: ${{ runner.os }}-${{ matrix.ghc }}-20220419-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-20220419-
+
       # See https://github.com/haskell/cabal/pull/8739
       - name: Sudo chmod to permit ghcup to update its cache
         run: |
@@ -227,20 +241,6 @@ jobs:
           ghc --version
           cabal update
 
-      #  See the following link for a breakdown of the following step
-      #  https://github.com/haskell/actions/issues/7#issuecomment-745697160
-      #
-      # See https://github.com/haskell/cabal/pull/8739 for why Windows is excluded
-      - if: ${{ runner.os != 'Windows' }}
-        uses: actions/cache@v3
-        with:
-          # validate.sh uses a special build dir
-          path: |
-            ${{ steps.setup-haskell.outputs.cabal-store }}
-            dist-*
-          key: ${{ runner.os }}-${{ matrix.ghc }}-20220419-${{ github.sha }}
-          restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-20220419-
-
       - name: Work around git problem https://bugs.launchpad.net/ubuntu/+source/git/+bug/1993586 (cabal PR #8546)
         run: |
           git config --global protocol.file.allow always
@@ -252,7 +252,7 @@ jobs:
         run: |
           cd $(mktemp -d)
           cabal install cabal-plan --constraint='cabal-plan +exe' --allow-newer
-          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
+          echo "$HOME/.cabal/bin:$HOME/.local/bin" >> $GITHUB_PATH
 
       # The tool is not essential to the rest of the test suite. If
       # hackage-repo-tool is not present, any test that requires it will
@@ -348,17 +348,6 @@ jobs:
           git fetch origin $GITHUB_SHA:temporary-ci-branch
           git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
 
-      - name: Install extra compiler
-        run: |
-          apt-get update
-          apt-get install -y ghc-${{ matrix.extra-ghc }}-dyn
-
-      - uses: haskell/actions/setup@v2
-        id: setup-haskell
-        with:
-          ghc-version: ${{ matrix.ghc }}
-          cabal-version: '3.8.1.0'
-
       # As we are reusing the cached build dir from the previous step
       # the generated artifacts are available here,
       # including the cabal executable and the test suite
@@ -370,11 +359,22 @@ jobs:
           key: ${{ runner.os }}-${{ matrix.ghc }}-20220419-${{ github.sha }}
           restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-20220419-
 
+      - name: Install extra compiler
+        run: |
+          apt-get update
+          apt-get install -y ghc-${{ matrix.extra-ghc }}-dyn
+
+      - uses: haskell/actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: ${{ matrix.ghc }}
+          cabal-version: latest # latest is mandatory for cabal-testsuite, see https://github.com/haskell/cabal/issues/8133
+
       - name: Install cabal-plan
         run: |
           cd $(mktemp -d)
           cabal install cabal-plan --constraint='cabal-plan +exe'
-          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
+          echo "$HOME/.cabal/bin:$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Validate build
         run: sh validate.sh ${{ env.COMMON_FLAGS }} -s build
@@ -422,7 +422,7 @@ jobs:
         run: |
           cd $(mktemp -d)
           cabal install cabal-plan --constraint='cabal-plan +exe'
-          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
+          echo "$HOME/.cabal/bin:$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Download cabal executable from workflow artifacts
         uses: actions/download-artifact@v3

diff --git a/Cabal-QuickCheck/Cabal-QuickCheck.cabal b/Cabal-QuickCheck/Cabal-QuickCheck.cabal
@@ -1,6 +1,10 @@
 cabal-version: 2.2
 name:          Cabal-QuickCheck
+<<<<<<< HEAD
 version:       3.10.1.0
+=======
+version:       3.11.0.0
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
 synopsis:      QuickCheck instances for types in Cabal
 category:      Testing
 description:
@@ -13,8 +17,13 @@ library
   build-depends:
     , base
     , bytestring
+<<<<<<< HEAD
     , Cabal         ^>=3.10.0.0
     , Cabal-syntax  ^>=3.10.0.0
+=======
+    , Cabal         ^>=3.11.0.0
+    , Cabal-syntax  ^>=3.11.0.0
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
     , QuickCheck    ^>=2.13.2 || ^>=2.14
 
   exposed-modules:

diff --git a/Cabal-described/Cabal-described.cabal b/Cabal-described/Cabal-described.cabal
@@ -1,6 +1,10 @@
 cabal-version: 2.2
 name:          Cabal-described
+<<<<<<< HEAD
 version:       3.10.1.0
+=======
+version:       3.11.0.0
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
 synopsis:      Described functionality for types in Cabal
 category:      Testing, Parsec
 description:   Provides rere bindings
@@ -11,8 +15,13 @@ library
   ghc-options:      -Wall
   build-depends:
     , base
+<<<<<<< HEAD
     , Cabal             ^>=3.10.0.0
     , Cabal-syntax      ^>=3.10.0.0
+=======
+    , Cabal             ^>=3.11.0.0
+    , Cabal-syntax      ^>=3.11.0.0
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
     , containers
     , pretty
     , QuickCheck

diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal
@@ -1,6 +1,10 @@
 cabal-version: 2.2
 name:          Cabal-syntax
+<<<<<<< HEAD
 version:       3.10.1.0
+=======
+version:       3.11.0.0
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
 copyright:     2003-2023, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE

diff --git a/Cabal-tree-diff/Cabal-tree-diff.cabal b/Cabal-tree-diff/Cabal-tree-diff.cabal
@@ -1,6 +1,10 @@
 cabal-version: 2.2
 name:          Cabal-tree-diff
+<<<<<<< HEAD
 version:       3.10.1.0
+=======
+version:       3.11.0.0
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
 synopsis:      QuickCheck instances for types in Cabal
 category:      Testing
 description:   Provides tree-diff ToExpr instances for some types in Cabal
@@ -11,8 +15,13 @@ library
   ghc-options:      -Wall
   build-depends:
     , base
+<<<<<<< HEAD
     , Cabal-syntax  ^>=3.10.0.0
     , Cabal         ^>=3.10.0.0
+=======
+    , Cabal-syntax  ^>=3.11.0.0
+    , Cabal         ^>=3.11.0.0
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
     , tree-diff     ^>=0.1 || ^>=0.2
 
   exposed-modules:  Data.TreeDiff.Instances.Cabal

diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -1,6 +1,10 @@
 cabal-version: 2.2
 name:          Cabal
+<<<<<<< HEAD
 version:       3.10.1.0
+=======
+version:       3.11.0.0
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
 copyright:     2003-2023, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE
@@ -34,7 +38,11 @@ library
   hs-source-dirs: src
 
   build-depends:
+<<<<<<< HEAD
     Cabal-syntax ^>= 3.10,
+=======
+    Cabal-syntax ^>= 3.11,
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
     array      >= 0.4.0.1  && < 0.6,
     base       >= 4.9      && < 5,
     bytestring >= 0.10.0.0 && < 0.12,

diff --git a/Cabal/Makefile b/Cabal/Makefile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 VERSION=3.10.1.0
+=======
+VERSION=3.11.0.0
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
 
 #KIND=devel
 KIND=rc

diff --git a/Makefile b/Makefile
@@ -195,7 +195,11 @@ bootstrap-json-%: phony
 	cd bootstrap && cabal v2-run -v0 cabal-bootstrap-gen -- linux-$*.plan.json \
 		| python3 -m json.tool > linux-$*.json
 
+<<<<<<< HEAD
 BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.6 9.4.4
+=======
+BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.7 9.4.4
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
 
 bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)
 

diff --git a/bootstrap/cabal-bootstrap-gen.cabal b/bootstrap/cabal-bootstrap-gen.cabal
@@ -11,8 +11,13 @@ 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
+<<<<<<< HEAD
     , Cabal                  ^>=3.2.0.0  || ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.8.1.0 || ^>=3.10.1.0
     , Cabal-syntax           ^>=3.8.1.0 || ^>=3.10.1.0
+=======
+    , Cabal                  ^>=3.2.0.0  || ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.10.1.0
+    , Cabal-syntax           ^>=3.10.1.0
+>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844))
     , cabal-install-parsers  ^>=0.3.0.1  || ^>=0.4.5 || ^>=0.6
     , cabal-plan             ^>=0.7.0.0
     , containers             ^>=0.6.0.1

diff --git a/bootstrap/cabal.project b/bootstrap/cabal.project
@@ -3,3 +3,6 @@
 
 packages: .
 optimization: False
+
+allow-newer:
+  cabal-install-parsers:Cabal-syntax