-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34 from thisiswhereitype/master
1* Merge new travis script based on cabal 2* Examples consolidated into one file.
- Loading branch information
Showing
13 changed files
with
175 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,115 @@ | ||
| # This Travis job script has been generated by a script via | ||
| # | ||
| # runghc make_travis_yml_2.hs '--osx=8.4.3' 'pangraph.cabal' '-o' '.travis.yml' | ||
| # | ||
| # For more information, see https://github.com/haskell-CI/haskell-ci | ||
| # | ||
| language: c | ||
| sudo: false | ||
|
|
||
| git: | ||
| submodules: false # whether to recursively clone submodules | ||
|
|
||
| cache: | ||
| directories: | ||
| - $HOME/.ghc | ||
| - $HOME/.cabal | ||
| - $HOME/.stack | ||
| - $HOME/.cabal/packages | ||
| - $HOME/.cabal/store | ||
| - $HOME/.ghc-install | ||
|
|
||
| before_cache: | ||
| - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log | ||
| # remove files that are regenerated by 'cabal update' | ||
| - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.* | ||
| - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json | ||
| - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache | ||
| - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar | ||
| - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx | ||
|
|
||
| - rm -rfv $HOME/.cabal/packages/head.hackage | ||
|
|
||
| matrix: | ||
| include: | ||
| # - os: osx | ||
| # before_install: | ||
| # - brew update | ||
| # - brew install haskell-stack | ||
|
|
||
| - os: linux | ||
| addons: | ||
| apt: | ||
| packages: | ||
| - libgmp-dev | ||
| before_install: | ||
| - mkdir -p ~/.local/bin | ||
| - export PATH=$HOME/.local/bin:$PATH | ||
| - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' | ||
|
|
||
| before_script: | ||
| - stack setup | ||
| - stack exec -- ghc --version | ||
| - stack build | ||
| include: | ||
| - compiler: "ghc-8.4.3" | ||
| # env: TEST=--disable-tests BENCH=--disable-benchmarks | ||
| addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}} | ||
| - compiler: "ghc-8.2.2" | ||
| # env: TEST=--disable-tests BENCH=--disable-benchmarks | ||
| addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}} | ||
| - compiler: "ghc-8.0.2" | ||
| # env: TEST=--disable-tests BENCH=--disable-benchmarks | ||
| addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}} | ||
| - compiler: "ghc-8.4.3" | ||
| # env: TEST=--disable-tests BENCH=--disable-benchmarks | ||
| addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}} | ||
| os: osx | ||
|
|
||
| before_install: | ||
| - HC=${CC} | ||
| - HCPKG=${HC/ghc/ghc-pkg} | ||
| - unset CC | ||
| - ROOTDIR=$(pwd) | ||
| - mkdir -p $HOME/.local/bin | ||
| - "if [ \"$(uname)\" = \"Darwin\" ]; then brew update; brew upgrade python@3; curl https://haskell.futurice.com/haskell-on-macos.py | python3 - --make-dirs --install-dir=$HOME/.ghc-install --cabal-alias=head install cabal-install-head ${HC}; fi" | ||
| - "if [ \"$(uname)\" = \"Darwin\" ]; then PATH=$HOME/.ghc-install/ghc/bin:$HOME/local/bin:$PATH; else PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH; fi" | ||
| - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) | ||
| - echo $HCNUMVER | ||
|
|
||
| install: | ||
| - cabal --version | ||
| - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" | ||
| - BENCH=${BENCH---enable-benchmarks} | ||
| - TEST=${TEST---enable-tests} | ||
| - HADDOCK=${HADDOCK-true} | ||
| - UNCONSTRAINED=${UNCONSTRAINED-true} | ||
| - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false} | ||
| - GHCHEAD=${GHCHEAD-false} | ||
| - travis_retry cabal update -v | ||
| - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config" | ||
| - rm -fv cabal.project cabal.project.local | ||
| - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$' | ||
| - "printf 'packages: \".\"\\n' > cabal.project" | ||
| - touch cabal.project.local | ||
| - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- pangraph | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi" | ||
| - cat cabal.project || true | ||
| - cat cabal.project.local || true | ||
| - if [ -f "./configure.ac" ]; then | ||
| (cd "." && autoreconf -i); | ||
| fi | ||
| - rm -f cabal.project.freeze | ||
| - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all | ||
| - cabal new-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: | ||
| - stack test | ||
| # test that source-distributions can be generated | ||
| - (cd "." && cabal sdist) | ||
| - mv "."/dist/pangraph-*.tar.gz ${DISTDIR}/ | ||
| - cd ${DISTDIR} || false | ||
| - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; | ||
| - "printf 'packages: pangraph-*/*.cabal\\n' > cabal.project" | ||
| - touch cabal.project.local | ||
| - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- pangraph | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi" | ||
| - cat cabal.project || true | ||
| - cat cabal.project.local || true | ||
| # this builds all libraries and executables (without tests/benchmarks) | ||
| - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all | ||
|
|
||
| # build & run tests, build benchmarks | ||
| - cabal new-build -w ${HC} ${TEST} ${BENCH} all | ||
| - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi | ||
|
|
||
| # cabal check | ||
| - (cd pangraph-* && cabal check) | ||
|
|
||
| # haddock | ||
| - rm -rf ./dist-newstyle | ||
| - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi | ||
|
|
||
| # Build without installed constraints for packages in global-db | ||
| - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi | ||
|
|
||
| # REGENDATA ["--osx=8.4.3","pangraph.cabal","-o",".travis.yml"] | ||
| # EOF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| module Pangraph.Example where | ||
|
|
||
| import Pangraph.Examples.SampleGraph(smallGraph) | ||
|
|
||
| import qualified Pangraph.GraphML.Parser as GraphML | ||
| import qualified Pangraph.GraphML.Writer as GraphML | ||
|
|
||
| import qualified Pangraph.Gml.Parser as Gml | ||
| import qualified Pangraph.Gml.Writer as Gml | ||
|
|
||
| import qualified Pangraph.Containers as Containers | ||
|
|
||
| main :: IO () | ||
| main = do | ||
| -- Serialise and re-parse the graph in to GraphML. | ||
| let Just gGraphML = (GraphML.parse . GraphML.write) smallGraph | ||
| -- Test equality | ||
| print $ "GraphML reflectivity: " ++ show (gGraphML == smallGraph) | ||
|
|
||
| -- Serialise and re-parse the graph into Gml | ||
| let Just gGml = (Gml.parse . Gml.write) smallGraph | ||
| print $ "Gml reflectivity: " ++ show (gGml == smallGraph) | ||
| -- Print the result of the Containers conversion | ||
| print $ ((\(a,_,_) -> a) . Containers.convert) smallGraph |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters