Update ci config

.circleci/config.yml

@@ -57,7 +57,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: "e575ff318c93add2a6d3f9107a52c5e37c666a98"
+      PACKCHECK_GITHUB_COMMIT: "dd6862df527f317fd4987afa523fba3f4fde7e19"
 
 executors:
   amd64-executor:

.cirrus.yml

@@ -1,54 +1,82 @@
 freebsd_instance:
-  image_family: freebsd-14-2
+  image_family: freebsd-14-3
 
 task:
-  name: FreeBSD+ghc-9.6.6+cabal
+  name: FreeBSD+ghc-9.10.3+cabal
   env:
-    LC_ALL: C.UTF-8
-    BUILD: cabal
-    GHCUP_VERSION: 0.1.40.0
-    DOCSPEC_URL: https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20210111/cabal-docspec-0.0.0.20210111.xz
-    DOCSPEC_OPTIONS: "--timeout 60 --check-properties --property-variables xs"
-    # GHCUP_GHC_OPTIONS: ${{ matrix.ghcup_ghc_options }}
-    GHCVER: 9.6.6
-    CABALVER: 3.10.1.0
-    DISABLE_DOCS: n
-    ENABLE_DOCSPEC: n
-    DISABLE_TEST: n
-    DISABLE_BENCH: n
-    DISABLE_DIST_CHECKS: y
-    # SDIST_OPTIONS: ${{ matrix.sdist_options }}
-    DISABLE_SDIST_BUILD: y
+    PACKCHECK_COMMAND: cabal
 
-    # Cabal options
+    # ------------------------------------------------------------------------
+    # Common options
+    # ------------------------------------------------------------------------
     CABAL_REINIT_CONFIG: y
-    # CABAL_BUILD_OPTIONS: ${{ matrix.cabal_build_options }} --flag limit-build-mem
-    # CABAL_BUILD_TARGETS: ${{ matrix.cabal_build_targets }}
-    CABAL_PROJECT: cabal.project
-    CABAL_CHECK_RELAX: y
+    LC_ALL: C.UTF-8
+
+    # ------------------------------------------------------------------------
+    # What to build
+    # ------------------------------------------------------------------------
+    # DISABLE_TEST: "y"
+    # DISABLE_BENCH: "y"
+    # DISABLE_DOCS: "y"
+    DISABLE_SDIST_BUILD: "y"
+    # DISABLE_SDIST_GIT_CHECK: "y"
+    DISABLE_DIST_CHECKS: "y"
+
+    # ------------------------------------------------------------------------
+    # Selecting tool versions
+    # ------------------------------------------------------------------------
+    # For updating see: https://downloads.haskell.org/~ghcup/
+    GHCUP_VERSION: 0.1.50.2
+    GHCVER: 9.10.3
 
-    # Stack options
-    # STACK_UPGRADE: "y"
-    # RESOLVER: ${{ matrix.resolver }}
-    # STACK_YAML: ${{ matrix.stack_yaml }}
-    # STACK_BUILD_OPTIONS: ${{ matrix.stack_build_options }}
+    # ------------------------------------------------------------------------
+    # stack options (if using stack builds)
+    # ------------------------------------------------------------------------
+    # Note requiring a specific version of stack using STACKVER may fail due to
+    # github API limit while checking and upgrading/downgrading to the specific
+    # version.
+    #STACKVER: "1.6.5"
+    #STACK_UPGRADE: "y"
+    #STACK_YAML: "stack.yaml"
 
-    # packcheck location and revision
+    # ------------------------------------------------------------------------
+    # cabal options
+    # ------------------------------------------------------------------------
+    CABAL_CHECK_RELAX: y
+    CABAL_PROJECT: cabal.project
+
+    # ------------------------------------------------------------------------
+    # Location of packcheck.sh (the shell script invoked to perform CI tests ).
+    # ------------------------------------------------------------------------
+    # You can either commit the packcheck.sh script at this path in your repo or
+    # you can use it by specifying the PACKCHECK_REPO_URL option below in which
+    # case it will be automatically copied from the packcheck repo to this path
+    # during CI tests. In any case it is finally invoked from this path.
     PACKCHECK: "./packcheck.sh"
+    # 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.1"
+    PACKCHECK_GITHUB_COMMIT: "dd6862df527f317fd4987afa523fba3f4fde7e19"
+
+  ghcup_cache:
+    folder: ~/.ghcup
+    fingerprint_script: echo $GHCUP_VERSION $GHCVER
+
+  cabal_packages_cache:
+    folder: ~/.cabal/packages
+    fingerprint_script: echo $GHCVER
 
-    # Pull token from "secrets" setting of the github repo
-    # COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
-    # COVERAGE: ${{ matrix.coverage }}
+  cabal_cache:
+    folder: ~/.cabal/store
+    fingerprint_script: echo $GHCVER
 
-    # hlint
-    # HLINT_VERSION: 3.6.1
-    # HLINT_OPTIONS: "lint"
-    # HLINT_TARGETS: "core/src src test benchmark"
+  #local_cache:
+  #  folder: ~/.local
+  #  fingerprint_script: echo $GHCVER
 
-    # Subdir
-    # SUBDIR: ${{ matrix.subdir }}
+  #local_bin_cache:
+  #  folder: ~/.local/bin
+  #  fingerprint_script: echo $HLINT_VERSION
 
   deps_install_script: |
       pkg install -y gmake
@@ -70,5 +98,9 @@ task:
       fi
 
   packcheck_run_script: |
-      export PATH=$HOME/.local/bin:$HOME/.ghcup/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/opt/curl/bin
-      bash -c "$PACKCHECK $BUILD"
+      # Commands like mount, sysctl for info require sbin
+      PTH=/usr/local/bin:/usr/bin:/bin:/sbin:/usr/sbin
+      # Use "bash -c" instead of invoking directly to preserve quoted
+      # arguments in PACKCHECK_COMMAND e.g. DOCSPEC_OPTIONS="--timeout 60".
+      # Direct invocation would word-split on spaces inside quoted values.
+      bash -c "$PACKCHECK $PACKCHECK_COMMAND PATH=$PTH"