diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f473fe1ffeb078f744c57bff74aef23a8596fc73
--- /dev/null
+++ b/.github/workflows/haskell-ci.yml
@@ -0,0 +1,178 @@
+# This GitHub workflow config has been generated by a script via
+#
+# haskell-ci 'github' '--config=cabal.haskell-ci' 'cabal.project'
+#
+# 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.11.20210111
+#
+# REGENDATA ("0.11.20210111",["github","--config=cabal.haskell-ci","cabal.project"])
+#
+name: Haskell-CI
+on:
+ push:
+ branches:
+ - master
+ pull_request:
+ branches:
+ - master
+jobs:
+ linux:
+ name: Haskell-CI Linux - GHC ${{ matrix.ghc }}
+ runs-on: ubuntu-18.04
+ container:
+ image: buildpack-deps:bionic
+ continue-on-error: ${{ matrix.allow-failure }}
+ strategy:
+ matrix:
+ include:
+ - ghc: 8.10.3
+ allow-failure: false
+ - ghc: 8.8.4
+ allow-failure: false
+ - ghc: 8.6.5
+ allow-failure: false
+ - ghc: 8.4.4
+ allow-failure: false
+ - ghc: 8.2.2
+ allow-failure: false
+ - ghc: 8.0.2
+ allow-failure: false
+ - ghc: 7.10.3
+ allow-failure: false
+ - ghc: 7.8.4
+ allow-failure: false
+ - ghc: 7.6.3
+ 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
+ apt-add-repository -y 'ppa:hvr/ghc'
+ apt-get update
+ apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
+ env:
+ GHC_VERSION: ${{ matrix.ghc }}
+ - 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
+ HC=/opt/ghc/$GHC_VERSION/bin/ghc
+ echo "HC=$HC" >> $GITHUB_ENV
+ echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
+ echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
+ echo "CABAL=/opt/cabal/3.2/bin/cabal -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
+ if [ $((HCNUMVER >= 70800)) -ne 0 ] ; then echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV ; else echo "ARG_BENCH=--disable-benchmarks" >> $GITHUB_ENV ; fi
+ echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
+ echo "GHCJSARITH=0" >> $GITHUB_ENV
+ env:
+ GHC_VERSION: ${{ matrix.ghc }}
+ - name: env
+ run: |
+ env
+ - name: write cabal config
+ run: |
+ mkdir -p $CABAL_DIR
+ cat >> $CABAL_CONFIG <<EOF
+ remote-build-reporting: anonymous
+ write-ghc-environment-files: never
+ remote-repo-cache: $CABAL_DIR/packages
+ logs-dir: $CABAL_DIR/logs
+ world-file: $CABAL_DIR/world
+ extra-prog-path: $CABAL_DIR/bin
+ symlink-bindir: $CABAL_DIR/bin
+ installdir: $CABAL_DIR/bin
+ build-summary: $CABAL_DIR/logs/build.log
+ store-dir: $CABAL_DIR/store
+ install-dirs user
+ prefix: $CABAL_DIR
+ repository hackage.haskell.org
+ url: http://hackage.haskell.org/
+ EOF
+ cat $CABAL_CONFIG
+ - name: versions
+ run: |
+ $HC --version || true
+ $HC --print-project-git-commit-id || true
+ $CABAL --version || true
+ - name: update cabal index
+ run: |
+ $CABAL v2-update -v
+ - name: install cabal-plan
+ run: |
+ mkdir -p $HOME/.cabal/bin
+ curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > 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: sdist
+ run: |
+ mkdir -p sdist
+ cd source || false
+ $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_containers="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/containers-[0-9.]*')"
+ echo "PKGDIR_containers=${PKGDIR_containers}" >> $GITHUB_ENV
+ PKGDIR_containers_tests="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/containers-tests-[0-9.]*')"
+ echo "PKGDIR_containers_tests=${PKGDIR_containers_tests}" >> $GITHUB_ENV
+ touch cabal.project
+ touch cabal.project.local
+ echo "packages: ${PKGDIR_containers}" >> cabal.project
+ echo "packages: ${PKGDIR_containers_tests}" >> cabal.project
+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package containers" >> cabal.project ; fi
+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package containers-tests" >> cabal.project ; fi
+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
+ cat >> cabal.project <<EOF
+ EOF
+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(binary|containers|containers-tests|text)$/; }' >> 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.ghc }}-${{ github.sha }}
+ path: ~/.cabal/store
+ restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
+ - 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: haddock
+ run: |
+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
+ - 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 fd72f68c202223bedffb073f5ba8a6389d0b8484..0000000000000000000000000000000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,169 +0,0 @@
-# This Travis job script has been generated by a script via
-#
-# haskell-ci '--config=cabal.haskell-ci' 'cabal.project'
-#
-# 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.10.2
-#
-version: ~> 1.0
-language: c
-os: linux
-dist: xenial
-git:
- # whether to recursively clone submodules
- submodules: false
-branches:
- only:
- - master
-cache:
- directories:
- - $HOME/.cabal/packages
- - $HOME/.cabal/store
- - $HOME/.hlint
-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
-jobs:
- include:
- - compiler: ghc-8.10.1
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.1","cabal-install-3.2"]}}
- os: linux
- - compiler: ghc-8.8.2
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.2","cabal-install-3.2"]}}
- os: linux
- - compiler: ghc-8.6.5
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.2"]}}
- os: linux
- - compiler: ghc-8.4.4
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.2"]}}
- os: linux
- - compiler: ghc-8.2.2
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.2"]}}
- os: linux
- - compiler: ghc-8.0.2
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.2"]}}
- os: linux
- - compiler: ghc-7.10.3
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.10.3","cabal-install-3.2"]}}
- os: linux
- - compiler: ghc-7.8.4
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.2"]}}
- os: linux
- - compiler: ghc-7.6.3
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.6.3","cabal-install-3.2"]}}
- os: linux
-before_install:
- - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
- - WITHCOMPILER="-w $HC"
- - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
- - HCPKG="$HC-pkg"
- - unset CC
- - CABAL=/opt/ghc/bin/cabal
- - CABALHOME=$HOME/.cabal
- - export PATH="$CABALHOME/bin:$PATH"
- - TOP=$(pwd)
- - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
- - echo $HCNUMVER
- - CABAL="$CABAL -vnormal+nowrap"
- - set -o pipefail
- - TEST=--enable-tests
- - BENCH=--enable-benchmarks
- - if [ $HCNUMVER -lt 70800 ] ; then BENCH=--disable-benchmarks ; fi
- - HEADHACKAGE=false
- - rm -f $CABALHOME/config
- - |
- echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
- echo "remote-build-reporting: anonymous" >> $CABALHOME/config
- echo "write-ghc-environment-files: always" >> $CABALHOME/config
- echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
- echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
- echo "world-file: $CABALHOME/world" >> $CABALHOME/config
- echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
- echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
- echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
- echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
- echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
- echo "install-dirs user" >> $CABALHOME/config
- echo " prefix: $CABALHOME" >> $CABALHOME/config
- echo "repository hackage.haskell.org" >> $CABALHOME/config
- echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
-install:
- - ${CABAL} --version
- - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
- - |
- echo "program-default-options" >> $CABALHOME/config
- echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
- - cat $CABALHOME/config
- - rm -fv cabal.project cabal.project.local cabal.project.freeze
- - travis_retry ${CABAL} v2-update -v
- # Generate cabal.project
- - rm -rf cabal.project cabal.project.local cabal.project.freeze
- - touch cabal.project
- - |
- echo "packages: containers" >> cabal.project
- echo "packages: containers-tests" >> cabal.project
- - if [ $HCNUMVER -ge 80200 ] ; then echo 'package containers' >> cabal.project ; fi
- - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
- - if [ $HCNUMVER -ge 80200 ] ; then echo 'package containers-tests' >> cabal.project ; fi
- - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
- - |
- - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(binary|containers|containers-tests|text)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- - cat cabal.project || true
- - cat cabal.project.local || true
- - if [ -f "containers/configure.ac" ]; then (cd "containers" && autoreconf -i); fi
- - if [ -f "containers-tests/configure.ac" ]; then (cd "containers-tests" && autoreconf -i); fi
- - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
- - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
- - rm cabal.project.freeze
-script:
- - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
- # Packaging...
- - ${CABAL} v2-sdist all
- # Unpacking...
- - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
- - cd ${DISTDIR} || false
- - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
- - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
- - PKGDIR_containers="$(find . -maxdepth 1 -type d -regex '.*/containers-[0-9.]*')"
- - PKGDIR_containers_tests="$(find . -maxdepth 1 -type d -regex '.*/containers-tests-[0-9.]*')"
- # Generate cabal.project
- - rm -rf cabal.project cabal.project.local cabal.project.freeze
- - touch cabal.project
- - |
- echo "packages: ${PKGDIR_containers}" >> cabal.project
- echo "packages: ${PKGDIR_containers_tests}" >> cabal.project
- - if [ $HCNUMVER -ge 80200 ] ; then echo 'package containers' >> cabal.project ; fi
- - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
- - if [ $HCNUMVER -ge 80200 ] ; then echo 'package containers-tests' >> cabal.project ; fi
- - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
- - |
- - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(binary|containers|containers-tests|text)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- - cat cabal.project || true
- - cat cabal.project.local || true
- # Building...
- # this builds all libraries and executables (without tests/benchmarks)
- - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
- # Building with tests and benchmarks...
- # build & run tests, build benchmarks
- - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
- # Testing...
- - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
- # haddock...
- - if [ $HCNUMVER -ge 80200 ] ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all ; fi
- # Building without installed constraints for packages in global-db...
- - rm -f cabal.project.local
- - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
-
-# REGENDATA ("0.10.2",["--config=cabal.haskell-ci","cabal.project"])
-# EOF
diff --git a/containers-tests/containers-tests.cabal b/containers-tests/containers-tests.cabal
index 9c094f18b5dd266f257436b086e72838b7477092..cbdf8bbdfa65d345c59b9508da3550b819d05512 100644
--- a/containers-tests/containers-tests.cabal
+++ b/containers-tests/containers-tests.cabal
@@ -26,7 +26,7 @@ extra-source-files:
benchmarks/LookupGE/*.hs
tested-with:
- GHC ==7.6.3 || ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.2 || ==8.10.1
+ GHC ==7.6.3 || ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.3
source-repository head
type: git
diff --git a/containers/containers.cabal b/containers/containers.cabal
index 0d5415c6651cd66dd7e7575bed42087620be52ce..1a33e0ed091421268bb8bbc0005ea12056068db7 100644
--- a/containers/containers.cabal
+++ b/containers/containers.cabal
@@ -25,7 +25,7 @@ extra-source-files:
include/containers.h
changelog.md
-tested-with: GHC==8.10.1, GHC==8.8.2, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3
+tested-with: GHC==8.10.3, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3
source-repository head
type: git