From 04cffcdeb6bb776edaf69777788ae9cc4b224e3c Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Sun, 7 Jan 2024 11:29:54 +0000 Subject: [PATCH 1/4] Support mtl-2.3 --- src/GHC/Vis/Internal.hs | 2 +- src/GHC/Vis/View/Common.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GHC/Vis/Internal.hs b/src/GHC/Vis/Internal.hs index 25b1411..022724e 100644 --- a/src/GHC/Vis/Internal.hs +++ b/src/GHC/Vis/Internal.hs @@ -22,7 +22,7 @@ import GHC.Vis.Types import GHC.HeapView hiding (pkg, modl, fun, arrWords) import Control.Monad -import Control.Monad.State.Strict hiding (State, fix) +import Control.Monad.State.Strict (put, get, gets) import Data.Char import Data.List hiding (insert) diff --git a/src/GHC/Vis/View/Common.hs b/src/GHC/Vis/View/Common.hs index 8e81a26..0dc6432 100644 --- a/src/GHC/Vis/View/Common.hs +++ b/src/GHC/Vis/View/Common.hs @@ -28,8 +28,8 @@ import Prelude hiding (catch) import Control.Concurrent import Control.DeepSeq import Control.Exception hiding (evaluate) - -import Control.Monad.State.Strict hiding (State, fix) +import Control.Monad +import Control.Monad.State.Strict (evalState, runState) import qualified Data.IntMap as M From 4f5cb3780d301fcc9f1d412864c7754f2706a23e Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Sun, 7 Jan 2024 11:30:03 +0000 Subject: [PATCH 2/4] Support ghc-heap-9.8 The field type in `AddrClosure` has changed from `Int` to `Ptr`. More importantly, Haskell flavour of `printf` does not support `%p` formatter anyway. --- src/GHC/Vis/Internal.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GHC/Vis/Internal.hs b/src/GHC/Vis/Internal.hs index 022724e..13100ef 100644 --- a/src/GHC/Vis/Internal.hs +++ b/src/GHC/Vis/Internal.hs @@ -142,7 +142,7 @@ parseInternal _ (FloatClosure _ val) = return [Unnamed $ printf "F# %0.5f" val] parseInternal _ (DoubleClosure _ val) = return [Unnamed $ printf "D# %0.5f" val] -parseInternal _ (AddrClosure _ val) = return [Unnamed $ printf "Addr# %p" val] +parseInternal _ (AddrClosure _ val) = return [Unnamed $ "Addr# " ++ show val] parseInternal _ (ConstrClosure (StgInfoTable _ 1 3 _ _ _) _ [_,0,0] _ "Data.ByteString.Internal" "PS") = return [Unnamed "ByteString 0 0"] @@ -351,7 +351,7 @@ showClosureFields (FloatClosure _ val) = [printf "F# %0.5f" val] showClosureFields (DoubleClosure _ val) = [printf "D# %0.5f" val] -showClosureFields (AddrClosure _ val) = [printf "Addr# %p" val] +showClosureFields (AddrClosure _ val) = ["Addr# " ++ show val] showClosureFields (ConstrClosure (StgInfoTable _ 1 3 _ 0 _) _ [_,0,0] _ "Data.ByteString.Internal" "PS") = ["ByteString","0","0"] From 6a640988e122b51011802e6b1f10ccba9a82c09f Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Sun, 7 Jan 2024 17:11:50 +0000 Subject: [PATCH 3/4] Require ghc-heap-view >= 0.6, ConstrClosure is not available earlier --- ghc-vis.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-vis.cabal b/ghc-vis.cabal index 27cb4c5..70f66c1 100644 --- a/ghc-vis.cabal +++ b/ghc-vis.cabal @@ -54,7 +54,7 @@ Library gtk3 >= 0.12, svgcairo >= 0.12, cairo >= 0.12, - ghc-heap-view >= 0.5 + ghc-heap-view >= 0.6 Hs-source-dirs: src/ Ghc-options: -Wall -fno-warn-unused-do-bind From 5ff6835ca948586374c837fe920a35dca99b7db8 Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Sun, 7 Jan 2024 15:54:37 +0000 Subject: [PATCH 4/4] Generate CI --- .github/workflows/haskell-ci.yml | 227 +++++++++++++++++++++++++++++++ ghc-vis.cabal | 2 +- 2 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/haskell-ci.yml diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml new file mode 100644 index 0000000..d8249b4 --- /dev/null +++ b/.github/workflows/haskell-ci.yml @@ -0,0 +1,227 @@ +# This GitHub workflow config has been generated by a script via +# +# haskell-ci 'github' 'ghc-vis.cabal' '--apt' 'libgtk-3-dev' '--no-cabal-check' +# +# To regenerate the script (for example after adjusting tested-with) run +# +# haskell-ci regenerate +# +# For more information, see https://github.com/haskell-CI/haskell-ci +# +# version: 0.17.20231219 +# +# REGENDATA ("0.17.20231219",["github","ghc-vis.cabal","--apt","libgtk-3-dev","--no-cabal-check"]) +# +name: Haskell-CI +on: + - push + - pull_request +jobs: + linux: + name: Haskell-CI - Linux - ${{ matrix.compiler }} + runs-on: ubuntu-20.04 + timeout-minutes: + 60 + container: + image: buildpack-deps:bionic + continue-on-error: ${{ matrix.allow-failure }} + strategy: + matrix: + include: + - compiler: ghc-9.8.1 + compilerKind: ghc + compilerVersion: 9.8.1 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.6.3 + compilerKind: ghc + compilerVersion: 9.6.3 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.4.7 + compilerKind: ghc + compilerVersion: 9.4.7 + setup-method: ghcup + allow-failure: false + - compiler: ghc-8.8.4 + compilerKind: ghc + compilerVersion: 8.8.4 + setup-method: hvr-ppa + allow-failure: false + - compiler: ghc-8.6.5 + compilerKind: ghc + compilerVersion: 8.6.5 + setup-method: hvr-ppa + allow-failure: false + fail-fast: false + steps: + - name: apt + run: | + apt-get update + apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 + if [ "${{ matrix.setup-method }}" = ghcup ]; then + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + apt-get update + apt-get install -y libgtk-3-dev + else + apt-add-repository -y 'ppa:hvr/ghc' + apt-get update + apt-get install -y "$HCNAME" libgtk-3-dev + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + fi + env: + HCKIND: ${{ matrix.compilerKind }} + HCNAME: ${{ matrix.compiler }} + HCVER: ${{ matrix.compilerVersion }} + - name: Set PATH and environment variables + run: | + echo "$HOME/.cabal/bin" >> $GITHUB_PATH + echo "LANG=C.UTF-8" >> "$GITHUB_ENV" + echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" + echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" + HCDIR=/opt/$HCKIND/$HCVER + if [ "${{ matrix.setup-method }}" = ghcup ]; then + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + else + HC=$HCDIR/bin/$HCKIND + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV" + echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + fi + + HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') + echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" + echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" + echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" + echo "HEADHACKAGE=false" >> "$GITHUB_ENV" + echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" + echo "GHCJSARITH=0" >> "$GITHUB_ENV" + env: + HCKIND: ${{ matrix.compilerKind }} + HCNAME: ${{ matrix.compiler }} + HCVER: ${{ matrix.compilerVersion }} + - name: env + run: | + env + - name: write cabal config + run: | + mkdir -p $CABAL_DIR + cat >> $CABAL_CONFIG <> $CABAL_CONFIG < cabal-plan.xz + echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c - + xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan + rm -f cabal-plan.xz + chmod a+x $HOME/.cabal/bin/cabal-plan + cabal-plan --version + - name: checkout + uses: actions/checkout@v3 + with: + path: source + - name: initial cabal.project for sdist + run: | + touch cabal.project + echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project + cat cabal.project + - name: sdist + run: | + mkdir -p sdist + $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist + - name: unpack + run: | + mkdir -p unpacked + find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \; + - name: generate cabal.project + run: | + PKGDIR_ghc_vis="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/ghc-vis-[0-9.]*')" + echo "PKGDIR_ghc_vis=${PKGDIR_ghc_vis}" >> "$GITHUB_ENV" + rm -f cabal.project cabal.project.local + touch cabal.project + touch cabal.project.local + echo "packages: ${PKGDIR_ghc_vis}" >> cabal.project + echo "package ghc-vis" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project + if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then echo "allow-newer: svgcairo:Cabal" >> cabal.project ; fi + if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "allow-newer: gtk3:bytestring, gtk3:text, pango:text, glib:bytestring, glib:text, cairo:bytestring, cairo:text" >> cabal.project ; fi + cat >> cabal.project <> cabal.project.local + cat cabal.project + cat cabal.project.local + - name: dump install plan + run: | + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all + cabal-plan + - name: restore cache + uses: actions/cache/restore@v3 + with: + key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} + path: ~/.cabal/store + restore-keys: ${{ runner.os }}-${{ matrix.compiler }}- + - name: install dependencies + run: | + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all + - name: build w/o tests + run: | + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all + - name: build + run: | + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always + - name: haddock + run: | + $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all + - name: unconstrained build + run: | + rm -f cabal.project.local + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all + - name: save cache + uses: actions/cache/save@v3 + if: always() + with: + key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} + path: ~/.cabal/store diff --git a/ghc-vis.cabal b/ghc-vis.cabal index 70f66c1..fb082e6 100644 --- a/ghc-vis.cabal +++ b/ghc-vis.cabal @@ -20,7 +20,7 @@ description: Visualize live data structures in GHCi. Evaluation is not how it can be used with GHCi's debugger: -tested-with: GHC == 7.4.1, GHC == 7.4.2, GHC == 7.6.1, GHC == 7.6.2, GHC == 7.6.3, GHC == 7.8.3, GHC == 7.8.4, GHC == 7.10.1, GHC == 7.10.2, GHC == 7.10.3, GHC == 8.0.2 +tested-with: GHC == 9.8.1, GHC == 9.6.3, GHC == 9.4.7, GHC == 8.8.4, GHC == 8.6.5 data-files: ghci data/main.ui data/welcome.svg data/legend_graph.svg data/legend_list.svg data/icon_collapse.svg data/icon_evaluate.svg data/hover_collapse.svg data/hover_evaluate.svg Extra-source-files: nonghci-test.hs