From 695e28bfc67a7c7108351c3f56f4fbce7f8f234a Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sat, 16 Apr 2022 08:59:54 +0200 Subject: [PATCH 1/5] Auto-generate more complete CI via haskell-ci Atm. requires a patched version of haskell-ci to include the "haddock" step. --- .../workflows/{ci.yml => ci.yml.deactivated} | 0 .github/workflows/haskell-ci.yml | 219 ++++++++++++++++++ .travis.yml | 125 ---------- cabal.haskell-ci | 16 +- 4 files changed, 232 insertions(+), 128 deletions(-) rename .github/workflows/{ci.yml => ci.yml.deactivated} (100%) create mode 100644 .github/workflows/haskell-ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml.deactivated similarity index 100% rename from .github/workflows/ci.yml rename to .github/workflows/ci.yml.deactivated diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml new file mode 100644 index 000000000..3f0f935c9 --- /dev/null +++ b/.github/workflows/haskell-ci.yml @@ -0,0 +1,219 @@ +# This GitHub workflow config has been generated by a script via +# +# haskell-ci 'github' 'hackage-server.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.14.3.20220416 +# +# REGENDATA ("0.14.3.20220416",["github","hackage-server.cabal"]) +# +name: Haskell-CI +on: + - push + - pull_request +jobs: + linux: + name: Haskell-CI - Linux - ${{ matrix.compiler }} + runs-on: ubuntu-18.04 + timeout-minutes: + 60 + container: + image: buildpack-deps:focal + continue-on-error: ${{ matrix.allow-failure }} + strategy: + matrix: + include: + - compiler: ghc-9.2.2 + compilerKind: ghc + compilerVersion: 9.2.2 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.0.2 + compilerKind: ghc + compilerVersion: 9.0.2 + setup-method: ghcup + allow-failure: false + - compiler: ghc-8.10.7 + compilerKind: ghc + compilerVersion: 8.10.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 + 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.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" + "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 + apt-get update + apt-get install -y libbrotli-dev + else + apt-add-repository -y 'ppa:hvr/ghc' + apt-get update + apt-get install -y "$HCNAME" libbrotli-dev + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 + 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/$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.6.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.6.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 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc 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@v2 + 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_hackage_server="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/hackage-server-[0-9.]*')" + echo "PKGDIR_hackage_server=${PKGDIR_hackage_server}" >> "$GITHUB_ENV" + rm -f cabal.project cabal.project.local + touch cabal.project + touch cabal.project.local + echo "packages: ${PKGDIR_hackage_server}" >> cabal.project + echo "package hackage-server" >> 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: cache + uses: actions/cache@v2 + 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_hackage_server} || false + ${CABAL} -vnormal check + - name: haddock + run: | + $CABAL v2-haddock $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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 65779e412..000000000 --- a/.travis.yml +++ /dev/null @@ -1,125 +0,0 @@ -# This Travis job script has been generated by a script via -# -# haskell-ci '--output=.travis.yml' '--config=cabal.haskell-ci' 'cabal.project' -# -# For more information, see https://github.com/haskell-CI/haskell-ci -# -# version: 0.3 -# -language: c -dist: xenial - -git: - submodules: false # whether to recursively clone submodules - -notifications: - irc: - channels: - - "irc.libera.chat#hackage" - skip_join: true - template: - - "\x0313hackage-server\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}" - -cache: - directories: - - $HOME/.cabal/packages - - $HOME/.cabal/store - -before_cache: - - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log - # remove files that are regenerated by 'cabal update' - - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.* - - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json - - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache - - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar - - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx - - - rm -rfv $CABALHOME/packages/head.hackage - -matrix: - include: - - compiler: "ghc-8.10.4" - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-3.2,ghc-8.10.4], sources: [hvr-ghc]}} - - compiler: "ghc-8.8.3" - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-3.2,ghc-8.8.3], sources: [hvr-ghc]}} - - allow_failures: - - compiler: "ghc-8.8.3" - -before_install: - - HC=/opt/ghc/bin/${CC} - - HCPKG=${HC/ghc/ghc-pkg} - - unset CC - - CABAL=/opt/ghc/bin/cabal - - CABALHOME=$HOME/.cabal - - export PATH="$CABALHOME/bin:$PATH" - - ROOTDIR=$(pwd) - - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) - - echo $HCNUMVER - - sudo apt-get -y install libbrotli-dev - -install: - - ${CABAL} --version - - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - - TEST=--enable-tests - - BENCH=--enable-benchmarks - - GHCHEAD=${GHCHEAD-false} - - travis_retry ${CABAL} update -v - - sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config - - rm -fv cabal.project cabal.project.local - - grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$' - - rm -f cabal.project - - touch cabal.project - - "printf 'packages: \".\"\\n' >> cabal.project" - - "echo 'constraints: foundation -none' >> cabal.project" - - "echo 'constraints: cryptonite -none' >> cabal.project" - - "echo 'constraints: cryptohash -none' >> cabal.project" - - "printf 'write-ghc-environment-files: always\\n' >> cabal.project" - - touch cabal.project.local - - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(hackage-server)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - - cat cabal.project || true - - cat cabal.project.local || true - - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi - - rm -f cabal.project.freeze - - ${CABAL} freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry - - "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" - - rm "cabal.project.freeze" - - ${CABAL} build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all - - ${CABAL} build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all - - rm -rf .ghc.environment.* "."/dist - - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) - -# Here starts the actual work to be performed for the package under test; -# any command which exits with a non-zero exit code causes the build to fail. -script: - # test that source-distributions can be generated - - ${CABAL} sdist all - - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - - cd ${DISTDIR} || false - - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - - rm -f cabal.project - - touch cabal.project - - "printf 'packages: \"hackage-server-*/*.cabal\"\\n' >> cabal.project" - - "echo 'constraints: foundation -none' >> cabal.project" - - "echo 'constraints: cryptonite -none' >> cabal.project" - - "echo 'constraints: cryptohash -none' >> cabal.project" - - "printf 'write-ghc-environment-files: always\\n' >> cabal.project" - - touch cabal.project.local - - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(hackage-server)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - - cat cabal.project || true - - cat cabal.project.local || true - # this builds all libraries and executables (without tests/benchmarks) - - ${CABAL} build -w ${HC} --disable-tests --disable-benchmarks all - - # build & run tests, build benchmarks - - ${CABAL} build -w ${HC} ${TEST} ${BENCH} all - - ${CABAL} test -w ${HC} ${TEST} ${BENCH} all - - # cabal check - - (cd hackage-server-* && ${CABAL} check) - - # Build without installed constraints for packages in global-db - - rm -f cabal.project.local; ${CABAL} build -w ${HC} --disable-tests --disable-benchmarks all; - -# REGENDATA ["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"] -# EOF diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 775eda057..f8acb9adf 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,4 +1,14 @@ -irc-channels: irc.libera.chat#hackage +installed: +all -Cabal --- allow failures with ghc-7.6 and ghc-7.8 -allow-failures: <7.9 +-- -- irc-channels works with GHA, but why send to a channel +-- -- when one can subscribe to github notifications? +-- irc-channels: irc.libera.chat#hackage + +-- Does not work with GHA: +-- -- allow failures with ghc-7.6 and ghc-7.8 +-- allow-failures: <7.9 + +-- Use Ubuntu 20.04 +distribution: focal + +apt: libbrotli-dev \ No newline at end of file From 87870549f61936a8baf64a6d470fdcc4bc30e22d Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sat, 16 Apr 2022 09:57:51 +0200 Subject: [PATCH 2/5] Haskell-CI: relax installed: -text --- .github/workflows/haskell-ci.yml | 2 +- cabal.haskell-ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 3f0f935c9..e3ebe1b9a 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -180,7 +180,7 @@ jobs: echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|hackage-server|text)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/cabal.haskell-ci b/cabal.haskell-ci index f8acb9adf..21c1a4557 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,4 +1,4 @@ -installed: +all -Cabal +installed: +all -Cabal -text -- -- irc-channels works with GHA, but why send to a channel -- -- when one can subscribe to github notifications? From 88b76a0121395156f4db87c10dcc952520fab4f2 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sat, 16 Apr 2022 10:42:56 +0200 Subject: [PATCH 3/5] Missing extra-source-files: tests/unpack-checks/LANGUAGE-GHC-9.2/ --- hackage-server.cabal | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hackage-server.cabal b/hackage-server.cabal index dbad0b2fb..105a243cc 100644 --- a/hackage-server.cabal +++ b/hackage-server.cabal @@ -59,6 +59,10 @@ extra-source-files: tests/unpack-checks/bad-specver-package-0/Main.hs tests/unpack-checks/bad-specver-package-0/Setup.hs tests/unpack-checks/bad-specver-package-0/bad-specver-package.cabal + tests/unpack-checks/LANGUAGE-GHC-9.2/LICENSE + tests/unpack-checks/LANGUAGE-GHC-9.2/Main.hs + tests/unpack-checks/LANGUAGE-GHC-9.2/Setup.hs + tests/unpack-checks/LANGUAGE-GHC-9.2/LANGUAGE-GHC-9.2.cabal source-repository head type: git From 51b19de3ad6b85bb727664575630454a8d5058a3 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sat, 16 Apr 2022 10:45:07 +0200 Subject: [PATCH 4/5] Haskell-CI: relax installed: -parsec --- .github/workflows/haskell-ci.yml | 2 +- cabal.haskell-ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index e3ebe1b9a..0aa3a3c9e 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -180,7 +180,7 @@ jobs: echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|hackage-server|parsec|text)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 21c1a4557..bc8774bef 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,4 +1,4 @@ -installed: +all -Cabal -text +installed: +all -Cabal -text -parsec -- -- irc-channels works with GHA, but why send to a channel -- -- when one can subscribe to github notifications? From 10d2cde01a83d52cd67e2cb0dd5e021579a34d44 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sat, 16 Apr 2022 10:52:12 +0200 Subject: [PATCH 5/5] Fixup: Missing extra-source-files: tests/unpack-checks/LANGUAGE-GHC-9.2/ --- hackage-server.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hackage-server.cabal b/hackage-server.cabal index 105a243cc..df72f0a14 100644 --- a/hackage-server.cabal +++ b/hackage-server.cabal @@ -62,7 +62,7 @@ extra-source-files: tests/unpack-checks/LANGUAGE-GHC-9.2/LICENSE tests/unpack-checks/LANGUAGE-GHC-9.2/Main.hs tests/unpack-checks/LANGUAGE-GHC-9.2/Setup.hs - tests/unpack-checks/LANGUAGE-GHC-9.2/LANGUAGE-GHC-9.2.cabal + tests/unpack-checks/LANGUAGE-GHC-9.2/LANGUAGE-GHC.cabal source-repository head type: git