Prepare for release version 0.7.1

.circleci/config.yml

@@ -1,4 +1,4 @@
-# packcheck-0.7.0
+# packcheck-0.7.1
 # You can use any of the options supported by packcheck as environment
 # variables here.  See https://github.com/composewell/packcheck for all
 # options and their explanation.
@@ -16,7 +16,7 @@ env: &env
       # ------------------------------------------------------------------------
       # GHC_OPTIONS: "-Werror"
       # For updating see: https://downloads.haskell.org/~ghcup/
-      GHCUP_VERSION: 0.1.20.0
+      GHCUP_VERSION: 0.1.40.0
       CABAL_REINIT_CONFIG: "y"
       LC_ALL: "C.UTF-8"
 
@@ -38,7 +38,7 @@ env: &env
       # version.
       #STACKVER: "1.6.5"
       #STACK_UPGRADE: "y"
-      #RESOLVER: "lts-21"
+      #RESOLVER: "lts-23"
       STACK_YAML: "stack.yaml"
 
       # ------------------------------------------------------------------------
@@ -65,7 +65,7 @@ env: &env
       # If you have not committed packcheck.sh in your repo at PACKCHECK
       # then it is automatically pulled from this URL.
       PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-      PACKCHECK_GITHUB_COMMIT: "v0.7.0"
+      PACKCHECK_GITHUB_COMMIT: "v0.7.1"
 
     # ubuntu seems to have better support than debian on CI systems
     docker:
@@ -147,23 +147,23 @@ save: &save
 #-----------------------------------------------------------------------------
 
 jobs:
-  cabal-ghc-9-8-1:
+  cabal-ghc-9-8-4:
       <<: *env
       steps:
         - checkout
         - *restore
         - *preinstall
         - run: |
-              bash -c "$PACKCHECK cabal GHCVER=9.8.1"
+              bash -c "$PACKCHECK cabal GHCVER=9.8.4"
         - *save
-  cabal-ghc-9-6-3:
+  cabal-ghc-9-6-6:
       <<: *env
       steps:
         - checkout
         - *restore
         - *preinstall
         - run: |
-              bash -c "$PACKCHECK cabal GHCVER=9.6.3"
+              bash -c "$PACKCHECK cabal GHCVER=9.6.6"
         - *save
   cabal-ghc-9-4-8:
       <<: *env
@@ -201,25 +201,25 @@ jobs:
         - run: |
               bash -c "$PACKCHECK cabal-v2 GHCVER=8.10.7"
         - *save
-  stack-lts-21:
+  stack-lts-23:
       <<: *env
       steps:
         - checkout
         - *restore
         - *preinstall
         - run: |
-            bash -c "$PACKCHECK stack RESOLVER=lts-21"
+            bash -c "$PACKCHECK stack RESOLVER=lts-23"
         - *save
 
 workflows:
   version: 2
   build:
     jobs:
       # Uncomment the configs that you want to enable
-      - cabal-ghc-9-8-1
-      - cabal-ghc-9-6-3
+      - cabal-ghc-9-8-4
+      - cabal-ghc-9-6-6
       - cabal-ghc-9-4-8
       - cabal-ghc-9-2-8
       - cabal-ghc-9-0-1
       - cabal-ghc-8-10-7
-      - stack-lts-21
+      - stack-lts-23

.cirrus.yml

@@ -2,16 +2,16 @@ freebsd_instance:
   image_family: freebsd-14-0
 
 task:
-  name: FreeBSD+packcheck+ghc-9.6.3+cabal-v2
+  name: FreeBSD+packcheck+ghc-9.10.1+cabal-v2
   env:
     LC_ALL: C.UTF-8
     BUILD: cabal-v2
-    GHCUP_VERSION: 0.1.20.0
-    DOCSPEC_URL: https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20210111/cabal-docspec-0.0.0.20210111.xz
+    GHCUP_VERSION: 0.1.40.0
+    DOCSPEC_URL: https://github.com/phadej/cabal-extras/releases/tag/cabal-docspec-0.0.0.20240703
     DOCSPEC_OPTIONS: "--timeout 60 --check-properties --property-variables xs"
     # GHCUP_GHC_OPTIONS: ${{ matrix.ghcup_ghc_options }}
-    GHCVER: 9.6.3
-    CABALVER: 3.10.1.0
+    GHCVER: 9.10.1
+    CABALVER: 3.12.1.0
     DISABLE_DOCS: n
     ENABLE_DOCSPEC: n
     DISABLE_TEST: n
@@ -36,7 +36,7 @@ task:
     # packcheck location and revision
     PACKCHECK: "./packcheck.sh"
     PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-    PACKCHECK_GITHUB_COMMIT: "084ed12f33ba9ef719aabefa7662a0fa600165dd"
+    PACKCHECK_GITHUB_COMMIT: "v0.7.1"
 
     # Pull token from "secrets" setting of the github repo
     # COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

.github/workflows/packcheck.yml

@@ -1,4 +1,4 @@
-# packcheck-0.7.0
+# packcheck-0.7.1
 # You can use any of the options supported by packcheck as environment
 # variables here.  See https://github.com/composewell/packcheck for all
 # options and their explanation.
@@ -49,7 +49,7 @@ jobs:
       # Selecting tool versions
       # ------------------------------------------------------------------------
       # For updating see: https://downloads.haskell.org/~ghcup/
-      GHCUP_VERSION: 0.1.20.0
+      GHCUP_VERSION: 0.1.40.0
       GHCVER: ${{ matrix.ghc_version }}
       GHCUP_GHC_OPTIONS: ${{ matrix.ghcup_ghc_options }}
       # RESOLVER: ${{ matrix.stack_resolver }}
@@ -88,7 +88,7 @@ jobs:
       # If you have not committed packcheck.sh in your repo at PACKCHECK
       # then it is automatically pulled from this URL.
       PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-      PACKCHECK_GITHUB_COMMIT: "v0.7.0"
+      PACKCHECK_GITHUB_COMMIT: "v0.7.1"
 
       # ------------------------------------------------------------------------
       # Final build variables
@@ -122,7 +122,7 @@ jobs:
           - name: ci
             command: cabal
             runner: ubuntu-latest
-            ghc_version: 9.8.1
+            ghc_version: 9.8.4
             cabal_project: cabal.project
 
           - name: ci
@@ -131,7 +131,19 @@ jobs:
             cabal_project: cabal.project
 
           - name: ci
-            ghc_version: 9.8.1
+            ghc_version: 9.8.4
+            command: cabal
+            runner: macos-latest
+            cabal_project: cabal.project
+
+          - name: ci
+            ghc_version: 9.10.1
+            command: cabal
+            runner: macos-latest
+            cabal_project: cabal.project
+
+          - name: ci
+            ghc_version: 9.12.1
             command: cabal
             runner: macos-latest
             cabal_project: cabal.project

Changelog.md

@@ -1,6 +1,8 @@
-## Unreleased
+## 0.7.1 (Feb 2025)
 
 * Set default "ghc" in PATH for cabal-docspec to work
+* FreeBSD support and Cirrus CI support for FreeBSD - see `.cirrus.yml`
+* `CABAL_TEST_OPTIONS` envvar to pass test-only options to cabal
 
 ## 0.7.0 (Dec 2023)
 

README.md

@@ -294,14 +294,14 @@ help | --help | -h      : show this help message
 --------------------------------------------------
 Selecting tool versions
 --------------------------------------------------
-GHCUP_VERSION           : [a.b.c.d] GHCUP version to install GHCVER if needed
+GHCUP_VERSION           : [a.b.c.d] ghcup version to install at $HOME/.ghcup/bin/ghcup (see https://downloads.haskell.org/~ghcup)
 GHCVER                  : [a.b.c | head] GHC version prefix (may not be enforced when using stack)
 CABALVER                : [a.b.c.d] Cabal version (prefix) to use
 STACKVER                : [a.b.c.d] Stack version (prefix) to use
 STACK_UPGRADE           : [y] DESTRUCTIVE! Upgrades stack to latest version
 RESOLVER                : Stack resolver to use for stack builds or cabal builds using stack
-HLINT_VERSION           : Download a specific version binary of hlint instead of using one in PATH
-DOCSPEC_URL             : cabal-docspec release URL to install at ~/.local/bin/cabal-docspec (see https://github.com/phadej/cabal-extras/releases/)
+HLINT_VERSION           : hlint version to install at $HOME/.local/bin/hlint (see https://github.com/ndmitchell/hlint/releases)
+DOCSPEC_URL             : cabal-docspec release URL to install at $HOME/.local/bin/cabal-docspec (see https://github.com/phadej/cabal-extras/releases/)
 
 --------------------------------------------------
 Where to find the required tools

appveyor.yml

@@ -1,4 +1,4 @@
-# packcheck-0.7.0
+# packcheck-0.7.1
 # You can use any of the options supported by packcheck as environment
 # variables here.  See https://github.com/composewell/packcheck for all
 # options and their explanation.
@@ -63,7 +63,7 @@ environment:
     # If you have not committed packcheck.sh in your repo at PACKCHECK_LOCAL_PATH
     # then it is automatically pulled from this URL.
     PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-    PACKCHECK_GITHUB_COMMIT: "v0.7.0"
+    PACKCHECK_GITHUB_COMMIT: "v0.7.1"
 
     # Override the temp directory to avoid sed escaping issues
     # See https://github.com/haskell/cabal/issues/5386

packcheck.cabal

@@ -1,5 +1,5 @@
 name:               packcheck
-version:            0.7.0
+version:            0.7.1
 synopsis:           Universal build and CI testing for Haskell packages
 description:
   This package contains a universal CI/build script @packcheck.sh@ and config
@@ -29,7 +29,9 @@ homepage:            https://github.com/composewell/packcheck
 bug-reports:         https://github.com/composewell/packcheck/issues
 license:             BSD3
 license-file:        LICENSE
-tested-with:           GHC==9.8.1
+tested-with:           GHC==9.12.1
+                     , GHC==9.10.1
+                     , GHC==9.8.4
                      , GHC==9.6.3
                      , GHC==9.4.8
                      , GHC==9.2.8

packcheck.sh

@@ -20,7 +20,7 @@
 # Utility functions
 #------------------------------------------------------------------------------
 
-PACKCHECK_VERSION=0.7.0
+PACKCHECK_VERSION=0.7.1
 
 show_version() {
   echo "packcheck version $PACKCHECK_VERSION"

stack.yaml

@@ -1,3 +1,3 @@
-resolver: lts-21.24
+resolver: lts-23.9
 packages:
 - '.'