Merge branch 'master' into parse-cabal-project-parsec

Author: jgotoh

.git-blame-ignore-revs

@@ -1,3 +1,11 @@
+# 2023
+########################################
+
+# Format the source with fourmolu
+10a14397e7295f79bb65ff505e52895f4864270a
+c7a5ac671338998395c1d12f04a0f9190d89e3af
+9985a2c27b1b292ca50489cf439193a8caa1249c
+
 # 2022
 ########################################
 
@@ -33,3 +41,4 @@ b0333ec5b73ba8f7a18223b203d999b38c75281d
 
 # Move source files under 'src/'.
 52d506bb4e25489f40cb5eb594dda5595aeb93ed
+

.githooks/pre-push

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+if [[ $(uname -s) != "Linux" ]]
+then
+  PROCS=$(sysctl -n hw.logicalcpu)
+else
+  PROCS=$(nproc)
+fi
+
+if which fourmolu > /dev/null ; then
+  find Cabal Cabal-syntax cabal-install -name '*.hs' -print0 \
+    ! -path Cabal-syntax/src/Distribution/Fields/Lexer.hs \
+    ! -path Cabal-syntax/src/Distribution/SPDX/LicenseExceptionId.hs \
+    ! -path Cabal-syntax/src/Distribution/SPDX/LicenseId.hs \
+    ! -path Cabal/src/Distribution/Simple/Build/Macros/Z.hs \
+    ! -path Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs \
+    | xargs -P "${PROCS}" -I {} fourmolu -q --mode check {}
+else
+  echo "Fourmolu not found, aborting."
+  exit 1
+fi

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,8 +2,9 @@
 ---
 Please include the following checklist in your PR:
 
-* [ ] Patches conform to the [coding conventions](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#conventions).
+* [ ] Patches conform to the [coding conventions](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#other-conventions).
 * [ ] Any changes that could be relevant to users [have been recorded in the changelog](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#changelog).
 * [ ] The documentation has been updated, if necessary.
+* [ ] Include [manual QA notes](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#qa-notes) if your PR relates to cabal-install.
 
-Please also shortly describe how you tested your change. Bonus points for added tests!
+Bonus points for added automated tests!

.github/workflows/bootstrap.yml

@@ -19,10 +19,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.3", "9.4.4"]
+        ghc: ["8.10.7", "9.0.2", "9.2.7", "9.4.4"]
         include:
           - os: macos-latest
-            ghc: "9.2.3"
+            ghc: "9.2.7"
     name: Bootstrap ${{ matrix.os }} ghc-${{ matrix.ghc }}
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/linting.yml

@@ -0,0 +1,23 @@
+name: Linting
+
+on:
+  pull_request:
+  push:
+    branches: ["master"]
+
+jobs:
+  fourmolu:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: haskell-actions/run-fourmolu@v8
+      with:
+        pattern: |
+          Cabal/**/*.hs
+          Cabal-syntax/**/*.hs
+          Cabal-install/**/*.hs
+          !Cabal-syntax/src/Distribution/Fields/Lexer.hs
+          !Cabal-syntax/src/Distribution/SPDX/LicenseExceptionId.hs
+          !Cabal-syntax/src/Distribution/SPDX/LicenseId.hs
+          !Cabal/src/Distribution/Simple/Build/Macros/Z.hs
+          !Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs

.github/workflows/quick-jobs.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Update Hackage index
         run: cabal v2-update
       - name: Install alex
-        run: cabal v2-install alex --constraint='alex ==3.2.6'
+        run: cabal v2-install alex --constraint='alex ==3.2.7.3'
       - uses: actions/checkout@v3
       - name: Regenerate files
         run: |