From b9588fe68afe12304191e7a8b57f40d68b2876e7 Mon Sep 17 00:00:00 2001 From: Hugh Davidson Date: Tue, 12 Dec 2023 13:08:27 +1100 Subject: [PATCH 1/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'bellroy-nix-foss': 'github:bellroy/bellroy-nix-foss/5c8b2fe6bf30b858dce75809d0caf6ccbf1c9f0e' (2023-08-29) → 'github:bellroy/bellroy-nix-foss/35391828c0526c0ce7bfa52c3dfb49e818f8740f' (2023-10-20) --- flake.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 5b8371d..3192735 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1693268846, + "lastModified": 1697772615, "narHash": "sha256-w3yK1C6/JsBVvZRKnZw4HPBajYWpcA2BR3t13mfALzE=", "owner": "bellroy", "repo": "bellroy-nix-foss", - "rev": "5c8b2fe6bf30b858dce75809d0caf6ccbf1c9f0e", + "rev": "35391828c0526c0ce7bfa52c3dfb49e818f8740f", "type": "github" }, "original": { From 47e732430e6c5ea5a422fa9728cc86f2ad10cfb3 Mon Sep 17 00:00:00 2001 From: Hugh Davidson Date: Tue, 12 Dec 2023 14:57:40 +1100 Subject: [PATCH 2/5] Update package bounds --- timeline.cabal | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/timeline.cabal b/timeline.cabal index 3d601c0..02c3a84 100644 --- a/timeline.cabal +++ b/timeline.cabal @@ -15,7 +15,7 @@ author: Bellroy Tech Team maintainer: Bellroy Tech Team category: Development build-type: Simple -tested-with: GHC ==8.10.7 || ==9.2.6 || ==9.4.4 +tested-with: GHC ==8.10.7 || ==9.2.6 || ==9.4.4 || ==9.6.2 extra-source-files: CHANGELOG.md README.md @@ -28,12 +28,11 @@ source-repository head common deps build-depends: , base >=4.14.3 && <4.19 - , containers >=0.6.5 && <0.7 + , containers >=0.6.5 && <0.7.1 , hedgehog >=1.1 && <1.5 , indexed-traversable >=0.1.2 && <0.2 - , text ^>=1.2.4.1 || ^>=2.0 + , text ^>=1.2.4.1 || >=2.0 && <2.1.1 , time >=1.9.3 && <1.13 - library import: deps hs-source-dirs: src/ @@ -59,7 +58,7 @@ test-suite tests build-depends: , bytestring >=0.10 && <0.13 , hashable ^>=1.4.2.0 - , tasty ^>=1.4.3 + , tasty >=1.4.3 && <1.6 , tasty-golden ^>=2.3.5 , tasty-hedgehog >=1.2.0.0 , tasty-hunit ^>=0.10.0.3 From fe88902cb7f22f78fd944e6368116c69038d94c1 Mon Sep 17 00:00:00 2001 From: Hugh Davidson Date: Tue, 12 Dec 2023 15:00:44 +1100 Subject: [PATCH 3/5] add haskell-ci file --- .github/workflows/haskell-ci.yml | 204 +++++++++++++++++++++++++++++++ 1 file changed, 204 insertions(+) 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..087800e --- /dev/null +++ b/.github/workflows/haskell-ci.yml @@ -0,0 +1,204 @@ +# This GitHub workflow config has been generated by a script via +# +# haskell-ci 'github' 'timeline.cabal' +# +# 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.16.3 +# +# REGENDATA ("0.16.3",["github","timeline.cabal"]) +# +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.6.2 + compilerKind: ghc + compilerVersion: 9.6.2 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.4.4 + compilerKind: ghc + compilerVersion: 9.4.4 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.2.6 + compilerKind: ghc + compilerVersion: 9.2.6 + setup-method: ghcup + allow-failure: false + - compiler: ghc-8.10.7 + compilerKind: ghc + compilerVersion: 8.10.7 + setup-method: ghcup + 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 + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$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.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + 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 + HC=$HOME/.ghcup/bin/$HCKIND-$HCVER + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV" + echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + 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_timeline="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/timeline-[0-9.]*')" + echo "PKGDIR_timeline=${PKGDIR_timeline}" >> "$GITHUB_ENV" + rm -f cabal.project cabal.project.local + touch cabal.project + touch cabal.project.local + echo "packages: ${PKGDIR_timeline}" >> cabal.project + echo "package timeline" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project + 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: tests + run: | + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct + - name: cabal check + run: | + cd ${PKGDIR_timeline} || false + ${CABAL} -vnormal check + - 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 From 5a57d87cdbc682c0f928f9677a107211e288e9cc Mon Sep 17 00:00:00 2001 From: Hugh Davidson Date: Tue, 12 Dec 2023 15:02:56 +1100 Subject: [PATCH 4/5] Support 9.6 version of base --- timeline.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/timeline.cabal b/timeline.cabal index 02c3a84..5acfa91 100644 --- a/timeline.cabal +++ b/timeline.cabal @@ -27,7 +27,7 @@ source-repository head common deps build-depends: - , base >=4.14.3 && <4.19 + , base >=4.14.3 && <4.20 , containers >=0.6.5 && <0.7.1 , hedgehog >=1.1 && <1.5 , indexed-traversable >=0.1.2 && <0.2 @@ -44,7 +44,7 @@ library ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-unused-imports build-depends: , semigroupoids >=5.3.7 && <6.1 - , template-haskell >=2.16.0 && <2.21 + , template-haskell >=2.16.0 && <2.22 , th-compat >=0.1.4 && <0.2 test-suite tests From f103d77b476ab288497373844e4d7bd67b4610ee Mon Sep 17 00:00:00 2001 From: Hugh Davidson Date: Tue, 12 Dec 2023 15:03:09 +1100 Subject: [PATCH 5/5] Add ghc962 to supported compilers --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 8d46816..10f49a7 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ path = ./package.nix; } ]; - supportedCompilers = [ "ghc8107" "ghc92" "ghc94" ]; + supportedCompilers = [ "ghc8107" "ghc92" "ghc94" "ghc962" ]; defaultCompiler = "ghc92"; }; }