diff --git a/.arcconfig b/.arcconfig deleted file mode 100644 index b88cb3432484eadb5ab1f4a62bfb6e4c88da9243..0000000000000000000000000000000000000000 --- a/.arcconfig +++ /dev/null @@ -1,5 +0,0 @@ -{ - "project.name" : "hpc", - "repository.callsign" : "HPC", - "phabricator.uri" : "https://phabricator.haskell.org" -} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..03ddc59aed717b46c767a17b40e56719ebc799c4 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,11 @@ +variables: + # Commit of ghc/ci-images repository from which to pull Docker images + DOCKER_REV: "853f348f9caf38b08740b280296fbd34e09abb3a" + +build: + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV" + tags: + - "x86_64-linux" + script: + - "cabal build -w $GHC lib:hpc" + - "cabal test -w $GHC" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 851a33a97ee92bbee200b8df77b16e2bc0698153..0000000000000000000000000000000000000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -env: - - GHCVER=7.2.2 - - GHCVER=7.4.1 - - GHCVER=7.4.2 - - GHCVER=7.6.1 - - GHCVER=7.6.2 - - GHCVER=7.6.3 - -before_install: - - sudo add-apt-repository -y ppa:hvr/ghc - - sudo apt-get update - - sudo apt-get install cabal-install-1.18 ghc-$GHCVER - - export PATH=/opt/ghc/$GHCVER/bin:$PATH - -install: - - cabal-1.18 update - - ghc --version - -script: - - cabal-1.18 configure -v2 - - cabal-1.18 build - - cabal-1.18 check - - cabal-1.18 sdist diff --git a/tests/raytrace/test.T b/tests/raytrace/test.T index 298debfe5c4a990ac48d2676114cec4b16fa9ef5..2c1dd7de5b29a073e34a85f4a1b315cbd81869d7 100644 --- a/tests/raytrace/test.T +++ b/tests/raytrace/test.T @@ -12,6 +12,6 @@ hpc_prefix = "perl hpcrun.pl --clear --exeext={exeext} --hpc={hpc}" # not the same) copy of this program. test('hpc_raytrace', [extra_files(['../hpcrun.pl', 'CSG.hs', 'Construct.hs', 'Data.hs', 'Eval.hs', 'Geometry.hs', 'Illumination.hs', 'Intersections.hs', 'Interval.hs', 'Main.hs', 'Misc.hs', 'Parse.hs', 'Primitives.hs', 'Surface.hs', 'galois.gml', 'galois.sample']), - cmd_prefix(hpc_prefix), reqlib('parsec'), ignore_stdout], + cmd_prefix(hpc_prefix), ignore_stdout], multimod_compile_and_run, ['Main','-fhpc -package parsec'])