From acf00658b16889a374efb81d4f5e9b87dbe30821 Mon Sep 17 00:00:00 2001 From: fendor Date: Sun, 31 May 2020 11:35:52 +0200 Subject: [PATCH 1/3] Add .travis.yml --- .travis.yml | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..0f4986b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,144 @@ +# This Travis job script has been generated by a script via +# +# haskell-ci '--hlint' '--tests' 'implicit-hie.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.10.1 +# +version: ~> 1.0 +language: c +os: linux +dist: xenial +git: + # whether to recursively clone submodules + submodules: false +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.8.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-8.8.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 + - 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 + - HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $WITHCOMPILER --dry-run hlint --constraint='hlint ==3.1.*' | perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER" + - "if [ ! -e $HOME/.hlint/hlint-$HLINTVER/hlint ]; then echo \"Downloading HLint version $HLINTVER\"; mkdir -p $HOME/.hlint; curl --write-out 'Status Code: %{http_code} Redirects: %{num_redirects} Total time: %{time_total} Total Dsize: %{size_download}\\n' --silent --location --output $HOME/.hlint/hlint-$HLINTVER.tar.gz \"https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz\"; tar -xzv -f $HOME/.hlint/hlint-$HLINTVER.tar.gz -C $HOME/.hlint; fi" + - mkdir -p $CABALHOME/bin && ln -sf "$HOME/.hlint/hlint-$HLINTVER/hlint" $CABALHOME/bin/hlint + - hlint --version + # Generate cabal.project + - rm -rf cabal.project cabal.project.local cabal.project.freeze + - touch cabal.project + - | + echo "packages: ." >> cabal.project + - echo 'package implicit-hie' >> cabal.project + - "echo ' ghc-options: -Werror=missing-methods' >> cabal.project" + - | + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(implicit-hie)$' || true) | 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 + - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} + - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" + - rm cabal.project.freeze + - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all + - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all +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_implicit_hie="$(find . -maxdepth 1 -type d -regex '.*/implicit-hie-[0-9.]*')" + # Generate cabal.project + - rm -rf cabal.project cabal.project.local cabal.project.freeze + - touch cabal.project + - | + echo "packages: ${PKGDIR_implicit_hie}" >> cabal.project + - echo 'package implicit-hie' >> cabal.project + - "echo ' ghc-options: -Werror=missing-methods' >> cabal.project" + - | + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(implicit-hie)$' || 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 + # HLint.. + - (cd ${PKGDIR_implicit_hie} && hlint src) + - (cd ${PKGDIR_implicit_hie} && hlint app) + # cabal check... + - (cd ${PKGDIR_implicit_hie} && ${CABAL} -vnormal check) + # haddock... + - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all + # 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.1",["--hlint","--tests","implicit-hie.cabal"]) +# EOF From 81570f515041f93770121b20958890d165022a62 Mon Sep 17 00:00:00 2001 From: fendor Date: Sun, 31 May 2020 11:40:22 +0200 Subject: [PATCH 2/3] Fix tests --- test/hie.yaml.cbl | 14 +++++++------- test/stackHie.yaml | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/hie.yaml.cbl b/test/hie.yaml.cbl index e3da4a7..4faf065 100644 --- a/test/hie.yaml.cbl +++ b/test/hie.yaml.cbl @@ -1,22 +1,22 @@ cradle: cabal: - - path: "./src" + - path: "src" component: "lib:haskell-language-server" - - path: "./exe/Main.hs" + - path: "exe/Main.hs" component: "haskell-language-server:exe:haskell-language-server" - - path: "./exe/Arguments.hs" + - path: "exe/Arguments.hs" component: "haskell-language-server:exe:haskell-language-server" - - path: "./exe/Wrapper.hs" + - path: "exe/Wrapper.hs" component: "haskell-language-server:exe:haskell-language-server-wrapper" - - path: "./exe/Arguments.hs" + - path: "exe/Arguments.hs" component: "haskell-language-server:exe:haskell-language-server-wrapper" - - path: "./test/functional" + - path: "test/functional" component: "haskell-language-server:test:func-test" - - path: "./test/utils" + - path: "test/utils" component: "haskell-language-server:lib:hls-test-utils" diff --git a/test/stackHie.yaml b/test/stackHie.yaml index f0ed5ca..8a7aed6 100644 --- a/test/stackHie.yaml +++ b/test/stackHie.yaml @@ -1,10 +1,10 @@ cradle: stack: - - path: "./src" + - path: "src" component: "implicit-hie:lib" - - path: "./app/Main.hs" + - path: "app/Main.hs" component: "implicit-hie:exe:gen-hie" - - path: "./test" + - path: "test" component: "implicit-hie:test:implicit-hie-test" From 57afb9518fc595f54be3ae937d8393577353f249 Mon Sep 17 00:00:00 2001 From: fendor Date: Sun, 31 May 2020 12:00:55 +0200 Subject: [PATCH 3/3] Add missing extra-source-files for tests --- implicit-hie.cabal | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/implicit-hie.cabal b/implicit-hie.cabal index 0eeec0b..d04bd47 100644 --- a/implicit-hie.cabal +++ b/implicit-hie.cabal @@ -23,6 +23,11 @@ build-type: Simple extra-source-files: README.md ChangeLog.md + test/benchSection + test/cabal.project + test/hie.yaml.cbl + test/stackHie.yaml + test/haskell-language-server-cabal source-repository head type: git