From 89b4cf205aa2e171c3a0933064919f91d017b816 Mon Sep 17 00:00:00 2001 From: Harendra Kumar Date: Tue, 2 Dec 2025 19:17:43 +0530 Subject: [PATCH 1/5] Add a nix flake file --- .packcheck.ignore | 2 ++ flake.lock | 61 +++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 17 +++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.packcheck.ignore b/.packcheck.ignore index 1d070a0..efac06e 100644 --- a/.packcheck.ignore +++ b/.packcheck.ignore @@ -3,3 +3,5 @@ .gitignore appveyor.yml cabal.project.ghc-head +flake.lock +flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..c33f136 --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "basepkgs": { + "locked": { + "lastModified": 1776017189, + "narHash": "sha256-UwybnZccjyEar+AUW7769+0rKGPpWJWTUzKDj5v1VjQ=", + "owner": "composewell", + "repo": "nixpack", + "rev": "dedcd2cba7dc0715ace19d185d23dd1751daed6e", + "type": "github" + }, + "original": { + "owner": "composewell", + "repo": "nixpack", + "rev": "dedcd2cba7dc0715ace19d185d23dd1751daed6e", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "type": "github" + } + }, + "nixpkgs-darwin": { + "locked": { + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "type": "github" + } + }, + "root": { + "inputs": { + "basepkgs": "basepkgs", + "nixpkgs": "nixpkgs", + "nixpkgs-darwin": "nixpkgs-darwin" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..3a9e634 --- /dev/null +++ b/flake.nix @@ -0,0 +1,17 @@ +{ + description = "fusion-plugin"; + + inputs = { + basepkgs.url = "github:composewell/nixpack/dedcd2cba7dc0715ace19d185d23dd1751daed6e"; + nixpkgs.url = "github:NixOS/nixpkgs/6c9a78c09ff4d6c21d0319114873508a6ec01655"; # nixos-unstable + nixpkgs-darwin.url = "github:NixOS/nixpkgs/6c9a78c09ff4d6c21d0319114873508a6ec01655"; # nixos-unstable + }; + + outputs = { self, nixpkgs, nixpkgs-darwin, basepkgs }: + basepkgs.nixpack.mkOutputs { + inherit nixpkgs nixpkgs-darwin basepkgs; + name = "fusion-plugin"; + sources = basepkgs.nixpack.lib.localSource "fusion-plugin" ./.; + packages = basepkgs.nixpack.lib.devPackage "fusion-plugin"; + }; +} From 8514d4ac0b51fdc4be8bf00eba090ad9cdafc187 Mon Sep 17 00:00:00 2001 From: Harendra Kumar Date: Thu, 4 Dec 2025 16:49:09 +0530 Subject: [PATCH 2/5] Shortcut fusion report in SilentMode --- src/Fusion/Plugin.hs | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/Fusion/Plugin.hs b/src/Fusion/Plugin.hs index 22ea6ab..9b79fbf 100644 --- a/src/Fusion/Plugin.hs +++ b/src/Fusion/Plugin.hs @@ -424,10 +424,10 @@ letBndrsThatAreCases dflags anns bind = goLet [] bind -- annotated with "Fuse" and traverse the Alt expressions to discover more -- let bindings. go parents True (Case _ _ _ alts) = - let binders = alts >>= (\(ALT_CONSTR(_,_,expr1)) -> go parents False expr1) + let result = alts >>= (\(ALT_CONSTR(_,_,expr1)) -> go parents False expr1) in case needInlineCaseAlt dflags parents anns alts of - Just x -> (parents, x) : binders - Nothing -> binders + Just x -> (parents, x) : result + Nothing -> result -- Only traverse the Alt expressions of the case to discover new let -- bindings. Do not match for annotated constructors in the Alts. @@ -755,13 +755,18 @@ fusionSimplify _hsc_env dflags = fusionReport :: String -> ReportMode -> ModGuts -> CoreM ModGuts fusionReport mesg reportMode guts = do - putMsgS $ "fusion-plugin: " ++ mesg ++ "..." - dflags <- getDynFlags - anns <- FMAP_SND getAnnotations deserializeWithData guts - when (anyUFM (any (== Fuse)) anns) $ - mapM_ (transformBind dflags anns) $ mg_binds guts - return guts - where + case reportMode of + ReportSilent -> return guts + _ -> do + putMsgS $ "fusion-plugin: " ++ mesg ++ "..." + dflags <- getDynFlags + anns <- FMAP_SND getAnnotations deserializeWithData guts + when (anyUFM (any (== Fuse)) anns) $ + mapM_ (transformBind dflags anns) $ mg_binds guts + return guts + + where + transformBind :: DynFlags -> UNIQ_FM -> CoreBind -> CoreM () transformBind dflags anns bind@(NonRec b _) = do let results = containsAnns dflags anns bind From bb06e6dc58652558a9b8056e66a56971ba3040aa Mon Sep 17 00:00:00 2001 From: Harendra Kumar Date: Tue, 14 Apr 2026 14:55:50 +0530 Subject: [PATCH 3/5] Updated tested-with field --- fusion-plugin.cabal | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/fusion-plugin.cabal b/fusion-plugin.cabal index 58ce9a0..ac6dc29 100644 --- a/fusion-plugin.cabal +++ b/fusion-plugin.cabal @@ -20,16 +20,16 @@ homepage: https://github.com/composewell/fusion-plugin bug-reports: https://github.com/composewell/fusion-plugin/issues license: Apache-2.0 license-file: LICENSE -tested-with: GHC==8.6.5 - , GHC==8.8.4 - , GHC==8.10.7 - , GHC==9.0.2 - , GHC==9.2.8 - , GHC==9.4.7 - , GHC==9.6.3 - , GHC==9.8.1 - , GHC==9.10.1 - , GHC==9.12.1 +tested-with: + GHC==8.10.7 + , GHC==9.0.2 + , GHC==9.2.8 + , GHC==9.4.7 + , GHC==9.6.3 + , GHC==9.8.4 + , GHC==9.10.3 + , GHC==9.12.4 + , GHC==9.14.1 author: Pranay Sashank maintainer: streamly@composewell.com copyright: (c) 2019 Composewell Technologies From 78f32363287d82ebabc15b3e57cc50f0f793c35e Mon Sep 17 00:00:00 2001 From: Harendra Kumar Date: Tue, 14 Apr 2026 14:56:18 +0530 Subject: [PATCH 4/5] Sync github ci file with latest packcheck --- .github/workflows/haskell.yml | 555 +++++++++++++++++++++++++++++----- 1 file changed, 480 insertions(+), 75 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 1fc497e..9b5e629 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -1,121 +1,526 @@ -name: Build only +# 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. + +name: TEST + +#----------------------------------------------------------------------------- +# Events on which the build should be triggered +#----------------------------------------------------------------------------- on: + workflow_dispatch: + pull_request: push: branches: - master - pull_request: + +#----------------------------------------------------------------------------- +# Build matrix +#----------------------------------------------------------------------------- jobs: build: - name: GHC ${{ matrix.name }} + name: >- + ${{ matrix.runner }} + ${{ matrix.command }} + ${{ matrix.ghc_version }} + ${{ matrix.name }} env: - CABAL_REINIT_CONFIG: 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" - ENABLE_INSTALL: "n" + # ------------------------------------------------------------------------ + # Selecting tool versions + # ------------------------------------------------------------------------ + # For updating see: https://downloads.haskell.org/~ghcup/ + #GHCUP_VERSION: 0.1.50.2 - STACK_UPGRADE: "y" + # ------------------------------------------------------------------------ + # cabal options + # ------------------------------------------------------------------------ - CABAL_CHECK_RELAX: y - CABAL_NO_SANDBOX: y - CABAL_HACKAGE_MIRROR: hackage.haskell.org:http://hackage.fpcomplete.com + # CABAL_BUILD_OPTIONS="-j1" + # Enable the above option if you: + # 1. want logs in serial order to be able to correlate them better. + # + # 2. run into memory issues due to Build paralellism. We need to + # have sufficient per CPU memory, if not we can use a lower -j + # option; cabal default is ncpus. + # + # Currently (2026-03-12) from packcheck output we see: + # Linux: 15GB, 4 cpus + # macOS: 7GB, 3 cpus + # Windows: 16GB, 4 cpus - PACKCHECK: "./packcheck.sh" - PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck" - PACKCHECK_GITHUB_COMMIT: "7c4e1ab7a59b5ed6e92cfd0da67460a6116be4ac" + # ------------------------------------------------------------------------ + # 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" + + # ------------------------------------------------------------------------ + # Common options + # ------------------------------------------------------------------------ + + # Subdir + SUBDIR: ${{ matrix.subdir }} + + # If this option is enabled packcheck clears out the environment + # and only uses the options explicitly set on the command line, + # implicit environment won't affect the build. if you find this + # annoying comment this. + CHECK_ENV: "y" + + # NOTE: by capturing the options in env variables here quotes + # are presrved, if we expand them directly into the script + # quotes are lost. + # + # WARNING! you cannot use comments in this + COMMON_OPTIONS: >- + LC_ALL=C.UTF-8 + BUILD_PREFETCH=y + GHCUP_VERSION=latest + GHCVER=${{ matrix.ghc_version }} - BUILD: ${{ matrix.build }} - GHCVER: ${{ matrix.ghc_version }} - CABALVER: ${{ matrix.cabal_version }} - CABAL_PROJECT: ${{ matrix.cabal_project }} - CABAL_BUILD_OPTIONS: ${{ matrix.cabal_build_options }} - DISABLE_SDIST_BUILD: ${{ matrix.disable_sdist_build }} - GHCUP_GHC_OPTIONS: ${{ matrix.ghcup_ghc_options }} - GHCUP_VERSION: 0.1.20.0 + # WARNING! you cannot use comments in this + CABAL_OPTIONS: >- + CABAL_REINIT_CONFIG=y + CABAL_CHECK_RELAX=y + MATRIX_OPTIONS: ${{ matrix.pack_options }} + + # ------------------------------------------------------------------------ + # Location of packcheck.sh (the shell script invoked to perform CI tests ). + # ------------------------------------------------------------------------ + # You can either commit the packcheck.sh script in your repo root or + # you can use it by specifying the PACKCHECK_REPO_URL option. + # 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: "669c3b553add086bb8a667049ac21cf83499cf13" + + # ubuntu seems to have better support than debian on CI systems runs-on: ${{ matrix.runner }} + #continue-on-error: ${{ matrix.ignore_error }} strategy: fail-fast: false matrix: - name: [head, 9.12.1, 9.10.1, 9.8.1, 9.6.3, 9.4.7+macos, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5] - cabal_version: ["3.8.1.0"] + + # The order of jobs is important to optimize fail-fast, if + # fail-fast is set to true. + + # This section is to order the important jobs first especially for + # "fail-fast" so that these are the ones started first. + #name: + # - ci + + # IMPORTANT NOTE: + # If runner, command, ghc version are identical then the name of + # CI is used to distinguish the cache key. + + # The reason we have an explicit "name" field in the following + # entries is to force an additional config instead of adding to + # an existing config while adding additional configs. + # Look at + # for more info about adding matrix elements. + # Adding any element to the list will increase the number of matrix + # elements proportional to the cross product. + include: - - name: head - ghc_version: head - build: cabal-v2 + + #- name: ci + # runner: ubuntu-latest + # command: cabal + # ghc_version: head + # # The URL may change, to find a working URL go to https://gitlab.haskell.org/ghc/ghc/-/jobs/ + # # Find a debian10/11/12 job, click on a passed/failed status, at the + # # end of the output you will find the tar.xz name, put that tar + # # name after "raw/", and put the job name after "job=". + # # Also see https://github.com/mpickering/ghc-artefact-nix/blob/master/gitlab-artifact.nix + # # + # # May also use ghcup for installing ghc head version, use the + # # version "LatestNightly", and the following config: + # # ghcup config add-release-channel https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml + # # WARNING! cannot use # comments inside pack_options. + # pack_options: >- + # GHCUP_GHC_OPTIONS="-u https://gitlab.haskell.org/ghc/ghc/-/jobs/artifacts/master/raw/ghc-x86_64-linux-deb10-int_native-validate.tar.xz?job=x86_64-linux-deb10-int_native-validate" + # CABAL_PROJECT=cabal.project.ghc-head + # DISABLE_SDIST_BUILD="y" + + - name: ci runner: ubuntu-latest - cabal_project: cabal.project.ghc-head - ghcup_ghc_options: "-u https://gitlab.haskell.org/ghc/ghc/-/jobs/artifacts/master/raw/ghc-x86_64-linux-deb10-int_native-validate.tar.xz?job=x86_64-linux-deb10-int_native-validate" - - name: 9.12.1 - ghc_version: 9.12.1 - build: cabal-v2 + command: cabal + ghc_version: 9.14.1 + # WARNING! cannot use # comments inside pack_options. + #pack_options: >- + # CABAL_PROJECT=cabal.project + + - name: ci + runner: macos-latest + command: cabal + ghc_version: 9.12.4 + # WARNING! cannot use # comments inside pack_options. + #pack_options: >- + # CABAL_PROJECT=cabal.project + + - name: ci + runner: ubuntu-latest + command: cabal + ghc_version: 9.10.3 + # WARNING! cannot use # comments inside pack_options. + #pack_options: >- + # CABAL_PROJECT=cabal.project + + - name: ghc-9.10.3 runner: ubuntu-latest - - name: 9.10.1 - ghc_version: 9.10.1 - build: cabal-v2 + command: stack + # WARNING! cannot use # comments inside pack_options. + pack_options: >- + STACK_UPGRADE="y" + STACK_YAML="stack.yaml" + DISABLE_SDIST_BUILD="y" + + - name: ci runner: ubuntu-latest - - name: 9.8.1 - ghc_version: 9.8.1 - build: cabal-v2 + command: cabal + ghc_version: 9.8.4 + # WARNING! cannot use # comments inside pack_options. + #pack_options: >- + # CABAL_PROJECT=cabal.project + + - name: ci runner: ubuntu-latest - - name: 9.6.3 + command: cabal ghc_version: 9.6.3 - build: cabal-v2 + # WARNING! cannot use # comments inside pack_options. + #pack_options: >- + # CABAL_PROJECT=cabal.project + + - name: ci runner: ubuntu-latest - - name: 9.4.7+macos + command: cabal ghc_version: 9.4.7 - build: cabal-v2 - runner: macos-latest - - name: 9.2.8 + + - name: ci + runner: ubuntu-latest + command: cabal ghc_version: 9.2.8 - build: cabal-v2 + + - name: ci runner: ubuntu-latest - disable_sdist_build: "y" - - name: 9.0.2 + command: cabal ghc_version: 9.0.2 - build: cabal-v2 - runner: ubuntu-latest + # macos build on ghc 8.10.7 fails with some LLVM version issues. # See: https://github.com/haskell/vscode-haskell/issues/667 - - name: 8.10.7 - ghc_version: 8.10.7 - build: cabal-v2 - runner: ubuntu-latest - - name: 8.8.4 - ghc_version: 8.8.4 - build: cabal-v2 + + - name: ci runner: ubuntu-latest - - name: 8.6.5 - ghc_version: 8.6.5 - build: cabal-v2 + command: cabal + ghc_version: 8.10.7 + + - name: ci + runner: windows-latest + command: cabal + ghc_version: 9.14.1 + # WARNING! cannot use # comments inside pack_options. + # DISABLE_SDIST_BUILD for shorter paths on Windows + pack_options: >- + DISABLE_SDIST_BUILD="y" + + - name: ci runner: ubuntu-latest + command: hlint + # WARNING! cannot use # comments inside pack_options. + pack_options: >- + HLINT_VERSION=3.6.1 + HLINT_OPTIONS="lint" + HLINT_TARGETS="src" + + #- name: docspec + # runner: ubuntu-latest + # command: cabal + # ghc_version: 9.12.4 + # # WARNING! cannot use # comments inside pack_options. + # pack_options: >- + # ENABLE_DOCSPEC="y" + # DOCSPEC_URL=https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20250606/cabal-docspec-0.0.0.20250606-x86_64-linux.xz + # DOCSPEC_OPTIONS="--timeout 60" + # CABAL_PROJECT=cabal.project + +#----------------------------------------------------------------------------- +# Usually you do not need to change anything below, this is generic code for +# caching and running packcheck on Linux/Mac/Windows. +#----------------------------------------------------------------------------- steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v1 - name: Cache ~/.cabal + - name: Optimize Windows Runner Environment + if: runner.os == 'Windows' + shell: powershell + run: | + # Enable long paths. Sometimes failures occur due to path + # length limitation. + Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -value 1 + + # Cache saving is very slow on Windows, it could be due to tar, + # or the compression program or the file system. Changing the + # compression level of zstd does not help. We are also not able to pick + # another tar program by changing the path, tar is picked up by the + # cache action itself. + + # This does not seem to make much difference. + # Disable Windows Defender to speed up IO/Tar operations + Set-MpPreference -DisableRealtimeMonitoring $true + + - uses: actions/checkout@v4 + + # This should happen before cache restore. + - name: Remove ~/.ghcup symlink (non-Windows) + if: runner.os != 'Windows' + run: | + rm -f ~/.ghcup + + # See the "cabal path" output in the CI logs to tweak the cache + # locations. + + # Shared by all tests, all platforms + - name: Restore hackage package index (non-Windows) + id: restore-hackage + uses: actions/cache/restore@v4 + if: runner.os != 'Windows' with: - path: ~/.cabal - key: ${{ runner.os }}-${{ matrix.ghc_version }}-cabal + path: | + ~/.cache/cabal/packages + key: cabal-hackage-index-non-windows + + # GHC is not test/options specific + - name: Restore ghcup and ghc (non-Windows) + id: restore-ghcup + uses: actions/cache/restore@v4 + if: runner.os != 'Windows' + with: + path: | + ~/.ghcup + key: ghc-${{ matrix.ghc_version }}-v${{ matrix.ghc_salt }}-${{ matrix.runner }} + + # GHC is not test/options specific + #- name: Restore ghcup and ghc (Windows) + # id: restore-ghcup-win + # uses: actions/cache/restore@v4 + # if: runner.os == 'Windows' + # with: + # path: | + # C:/ghcup + # key: ghc-${{ matrix.ghc_version }}-v${{ matrix.ghc_salt }}-${{ matrix.runner }} + + # XXX If we want to invalidate the cache on resolver change we + # should use a separate cache for stack as it should be keyed on + # resolver as well. But that requires resolver as a matrix element + # and then copied to pack_options from there, needs some work. It + # should be fine as resolver minor version change can only increase + # the cache size. + # Deps are test/options specific + - name: Restore build dependencies (non-Windows) + id: restore-deps-nonwin + uses: actions/cache/restore@v4 + if: runner.os != 'Windows' + with: + # cabal: ~/.local/bin, ~/.local/state/cabal + # ~/.cache/cabal/packages can be cached, but will increase the + # cache size. But can save the "cabal update" time. + path: | + ~/.local/bin + ~/.local/state/cabal + ~/.stack + key: ${{ matrix.command }}-deps-ghc-${{ matrix.ghc_version }}-v${{ matrix.ghc_salt }}-${{ matrix.runner }}-${{ matrix.name }} + + # Deps are test/options specific + - name: Restore build dependencies, hackage index, local/bin (Windows) + id: restore-deps-win + uses: actions/cache/restore@v4 + if: runner.os == 'Windows' + with: + path: | + C:/cabal + key: ${{ matrix.command }}-deps-ghc-${{ matrix.ghc_version }}-v${{ matrix.ghc_salt }}-${{ matrix.runner }}-${{ matrix.name }} - name: Download packcheck + # on windows-latest GitHub Actions defaults to PowerShell + shell: bash run: | - if test ! -e "$PACKCHECK" - then - if test -z "$PACKCHECK_GITHUB_COMMIT" + download_one () { + if test ! -e "$1" + then + if test -z "$PACKCHECK_GITHUB_COMMIT" + then + die "Downloading [$1]: PACKCHECK_GITHUB_COMMIT env var is not specified." + fi + PACKCHECK_URL_PREFIX=${PACKCHECK_GITHUB_URL}/${PACKCHECK_GITHUB_COMMIT} + curl --fail -sLO ${PACKCHECK_URL_PREFIX}/$1 || exit 1 + chmod +x "$1" + elif test ! -x "$1" then - die "PACKCHECK_GITHUB_COMMIT is not specified." + chmod +x $1 fi - PACKCHECK_URL=${PACKCHECK_GITHUB_URL}/${PACKCHECK_GITHUB_COMMIT}/packcheck.sh - curl --fail -sL -o "$PACKCHECK" $PACKCHECK_URL || exit 1 - chmod +x $PACKCHECK - elif test ! -x "$PACKCHECK" - then - chmod +x $PACKCHECK + } + if test -n "$SUBDIR"; then + cd "$SUBDIR" fi + download_one packcheck.sh - - name: Run packcheck + # Store the function in a file so that it can be reused across multiple + # steps. + - name: Setup packcheck + shell: bash run: | - bash -c "$PACKCHECK $BUILD" + if test -n "$SUBDIR"; then + rm -f cabal.project + cd "$SUBDIR" + fi + cat << 'EOF' > packcheck-setup.sh + setup_packcheck_args() { + ARGS="${{ matrix.command }} $COMMON_OPTIONS" + if test "${{ matrix.command }}" = "cabal"; then + ARGS="$ARGS $CABAL_OPTIONS" + fi + + # Caution: do not use matrix.pack_options directly here + # quotes will get stripped. + ARGS="$ARGS $MATRIX_OPTIONS" + PATH_VAR=/bin:/usr/bin:/sbin:/usr/sbin + + case "$(uname)" in + Linux) + export GHCUP_INSTALL_BASE_PREFIX=$HOME + # Access usr/local seems to be much slower on github + #PATH_VAR="$PATH_VAR:/usr/local/.ghcup/bin" + ;; + CYGWIN*|MINGW*|MSYS*) + for var in APPDATA CABAL_DIR; do + val="${!var}" + [ -n "$val" ] && ARGS="$ARGS $var=\"$(cygpath -u "$val")\"" + done + ARGS="$ARGS CABAL_BUILDDIR=\"/c/b\" WINVER=$WINVER" + ARGS="$ARGS NUMBER_OF_PROCESSORS=$NUMBER_OF_PROCESSORS" + ARGS="$ARGS PROCESSOR_IDENTIFIER=\"$PROCESSOR_IDENTIFIER\"" + PATH_VAR="$PATH_VAR:/c/ghcup:/c/Program Files/7-Zip:/mingw64/bin" + ;; + esac + ARGS="$ARGS PATH=\"$PATH_VAR\"" + export ARGS + } + EOF + + - name: Run packcheck (dependencies only) + id: deps-only + # Check the relevant step based on the runner OS + if: | + (runner.os != 'Windows' && steps.restore-deps-nonwin.outputs.cache-hit != 'true') || + (runner.os == 'Windows' && steps.restore-deps-win.outputs.cache-hit != 'true') + shell: bash + run: | + if test -n "$SUBDIR"; then + cd "$SUBDIR" + fi + source packcheck-setup.sh + setup_packcheck_args + eval "./packcheck.sh $ARGS BUILD_DEPS_ONLY=y" + + - name: Save hackage package index (non-Windows) + uses: actions/cache/save@v4 + if: always() && steps.deps-only.outcome == 'success' && runner.os != 'Windows' && steps.restore-hackage.outputs.cache-hit != 'true' + with: + path: ~/.cache/cabal/packages + key: cabal-hackage-index-non-windows + + - name: Save ghcup and ghc (non-Windows) + uses: actions/cache/save@v4 + if: always() && steps.deps-only.outcome == 'success' && runner.os != 'Windows' && steps.restore-ghcup.outputs.cache-hit != 'true' + with: + path: ~/.ghcup + key: ghc-${{ matrix.ghc_version }}-v${{ matrix.ghc_salt }}-${{ matrix.runner }} + + # On Windows, ghc restore step takes 2-3 minutes whereas installing + # GHC takes less than 2 minutes. On top of this saving the ghc cache + # takes 7 minutes. So this does not make sense. + #- name: Save ghcup and ghc (Windows) + # uses: actions/cache/save@v4 + # if: always() && steps.deps-only.outcome == 'success' && runner.os == 'Windows' && steps.restore-ghcup-win.outputs.cache-hit != 'true' + # with: + # path: | + # C:/ghcup + # key: ghc-${{ matrix.ghc_version }}-v${{ matrix.ghc_salt }}-${{ matrix.runner }} + + # Deps are test/options specific, hence, matrix.name in the key + - name: Save build dependencies (non-Windows) + uses: actions/cache/save@v4 + if: always() && steps.deps-only.outcome == 'success' && runner.os != 'Windows' && steps.restore-deps-nonwin.outputs.cache-hit != 'true' + with: + path: | + ~/.local/bin + ~/.local/state/cabal + ~/.stack + key: ${{ matrix.command }}-deps-ghc-${{ matrix.ghc_version }}-v${{ matrix.ghc_salt }}-${{ matrix.runner }}-${{ matrix.name }} + + # hackage package index is part of C:/cabal + # Deps are test/options specific, hence, matrix.name in the key + # Add if needed ~/AppData/Roaming/local + - name: Save build dependencies (Windows) + uses: actions/cache/save@v4 + if: always() && steps.deps-only.outcome == 'success' && runner.os == 'Windows' && steps.restore-deps-win.outputs.cache-hit != 'true' + with: + path: | + C:/cabal + key: ${{ matrix.command }}-deps-ghc-${{ matrix.ghc_version }}-v${{ matrix.ghc_salt }}-${{ matrix.runner }}-${{ matrix.name }} + + - name: Run packcheck (final build) + shell: bash + run: | + if test -n "$SUBDIR"; then + cd "$SUBDIR" + fi + source packcheck-setup.sh + setup_packcheck_args + eval "./packcheck.sh $ARGS BUILD_PACKAGE_ONLY=y" + + # Enable for debugging, this itself takes 50 sec on Windows, in packcheck + # build which is tiny. + #- name: Check cache locations + # shell: bash + # run: | + # # We want to see if any cache paths are symlinks; e.g. on github + # # ~/.ghcup is a pre-existing symlink to /usr/local. + # if [ "$RUNNER_OS" == "Windows" ]; then + # # Convert Windows paths to Unix-style for Bash + # APPDATA_UNIX=$(cygpath "$APPDATA") + # list="$APPDATA_UNIX/local C:/ghcup C:/cabal" + # else + # list="$HOME/.local/bin $HOME/.local/state/cabal $HOME/.ghcup $HOME/.stack" + # fi + + # for dir in $list; do + # # macOS does not have --no-dereference option + # if [ -L "$dir" ]; then + # echo "$dir is a symlink -> $(readlink $dir)" + # elif [ -d "$dir" ]; then + # du -sh "$dir" 2>/dev/null || echo "$dir permission denied" + # else + # echo "$dir missing or not a dir" + # fi + # done + # echo + # #ls -ld $list 2>/dev/null || true + # ls -al $list 2>/dev/null || true From 87dc53a63dccd310ec1b135721546363bbf61329 Mon Sep 17 00:00:00 2001 From: Harendra Kumar Date: Tue, 14 Apr 2026 14:59:21 +0530 Subject: [PATCH 5/5] Sync appveyor config with latest packcheck --- appveyor.yml | 67 +++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 52fdc99..c6c92b7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ -# packcheck-0.4.2 +# packcheck-0.7.1 # You can use any of the options supported by packcheck as environment -# variables here. See https://github.com/harendra-kumar/packcheck for all +# variables here. See https://github.com/composewell/packcheck for all # options and their explanation. branches: @@ -15,43 +15,34 @@ environment: # ------------------------------------------------------------------------ # Common options # ------------------------------------------------------------------------ - #GHC_OPTIONS: "-Werror" CABAL_REINIT_CONFIG: "y" LC_ALL: "C.UTF-8" + # ------------------------------------------------------------------------ + # How to build + # ------------------------------------------------------------------------ + # + GHCUP_VERSION: "0.1.50.2" + GHCVER: "9.14.1" + #CABALVER: "3.10.3.0" + # ------------------------------------------------------------------------ # What to build # ------------------------------------------------------------------------ # DISABLE_TEST: "y" # DISABLE_BENCH: "y" # DISABLE_DOCS: "y" - DISABLE_SDIST_BUILD: "y" - DISABLE_DIST_CHECKS: "y" - ENABLE_INSTALL: "y" - - # ------------------------------------------------------------------------ - # stack options - # ------------------------------------------------------------------------ - # 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" - RESOLVER: "lts-20.14" - STACK_ROOT: "c:\\sr" + # DISABLE_DIST_CHECKS: "y" + # DISABLE_SDIST_BUILD: "y" + # Note: these require the "diff" utility. + # DISABLE_SDIST_GIT_CHECK: "y" + DISABLE_SDIST_PROJECT_CHECK: "y" # ------------------------------------------------------------------------ # cabal options # ------------------------------------------------------------------------ CABAL_CHECK_RELAX: "y" - CABAL_NO_SANDBOX: "y" - CABAL_HACKAGE_MIRROR: "hackage.haskell.org:http://hackage.fpcomplete.com" - - # ------------------------------------------------------------------------ - # Where to find the required tools - # ------------------------------------------------------------------------ - PATH: "%PATH%;%APPDATA%\\local\\bin" - LOCAL_BIN: "%APPDATA%\\local\\bin" + #CABAL_PROJECT: "cabal.project" # ------------------------------------------------------------------------ # Location of packcheck.sh (the shell script invoked to perform CI tests ). @@ -64,31 +55,33 @@ 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: "ccc55fd4b895e842ca6e2d8ac63aa4acc1c3209a" + PACKCHECK_GITHUB_COMMIT: "669c3b553add086bb8a667049ac21cf83499cf13" # Override the temp directory to avoid sed escaping issues # See https://github.com/haskell/cabal/issues/5386 TMP: "c:\\tmp" +# Bump the -> version to clear the cache +# packcheck uses "%APPDATA%\\local" to install tools like hlint etc. +# cabal may use "%APPDATA%\\cabal" or "c:\\cabal" +# ghcup may use "%APPDATA%\\ghcup" or "c:\\ghcup" cache: - - "%STACK_ROOT%" - - "%LOCAL_BIN%" + - "%APPDATA%\\local\\bin -> v1" - "%APPDATA%\\cabal" - - "%APPDATA%\\ghc" -# - "%LOCALAPPDATA%\\Programs\\stack" + - "%LOCALAPPDATA%\\cabal" + - "C:\\ghcup" + - "C:\\cabal" +# Folder where the repository is cloned. clone_folder: "c:\\pkg" build: off before_test: -- if not exist %PACKCHECK_LOCAL_PATH% curl -sSkL -o%PACKCHECK_LOCAL_PATH% %PACKCHECK_GITHUB_URL%/%PACKCHECK_GITHUB_COMMIT%/packcheck.sh -- if not exist %LOCAL_BIN% mkdir %LOCAL_BIN% -- where stack.exe || curl -sSkL -ostack.zip http://www.stackage.org/stack/windows-x86_64 && 7z x stack.zip stack.exe && move stack.exe %LOCAL_BIN% -- if defined STACKVER (stack upgrade --binary-only --binary-version %STACKVER%) else (stack upgrade --binary-only || ver > nul) -- stack --version +- if not exist %PACKCHECK_LOCAL_PATH% curl --fail -sSL -o%PACKCHECK_LOCAL_PATH% %PACKCHECK_GITHUB_URL%/%PACKCHECK_GITHUB_COMMIT%/packcheck.sh test_script: -- stack setup > nul - for /f "usebackq tokens=*" %%i in (`where 7z.exe`) do set PATH7Z=%%i\.. - for /f "usebackq tokens=*" %%i in (`where git.exe`) do set PATHGIT=%%i\.. -- chcp 65001 && stack exec bash -- -c "chmod +x %PACKCHECK_LOCAL_PATH%; %PACKCHECK_LOCAL_PATH% stack PATH=/usr/bin:\"%PATH7Z%\":\"%PATHGIT%\"" +- for /f "usebackq tokens=*" %%i in (`where curl.exe`) do set PATHCURL=%%i\.. +- chcp 65001 +- bash %PACKCHECK_LOCAL_PATH% cabal PATH="/usr/bin:%PATH7Z%:%PATHGIT%:%PATHCURL%"