From e3d4f2ce0c078eb4b4f421383a8fdfefbb200738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Sat, 8 Aug 2020 11:58:54 +0200 Subject: [PATCH 1/2] travis: Fetch master in before_install phase --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d7387f66..2036d023 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,9 @@ ghc: before_install: - sudo apt-get update -qq - sudo apt-get install -qq libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libpulse-dev libblas-dev liblapack-dev + - git fetch origin master:origin/master script: - cabal new-build all --enable-tests - cabal new-test all --enable-tests - - git fetch origin master:origin/master && git rebase origin/master --exec "cabal new-build all --enable-tests" + - git rebase origin/master --exec "cabal new-build all --enable-tests" install: skip From b7bbf9fa038fa0c3110b67e0266b3134f80c7c52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Sat, 8 Aug 2020 11:59:33 +0200 Subject: [PATCH 2/2] Put test-repl.sh on CI as well --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2036d023..637faf18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,4 +13,6 @@ script: - cabal new-build all --enable-tests - cabal new-test all --enable-tests - git rebase origin/master --exec "cabal new-build all --enable-tests" + - ./test-repl.sh + - git rebase origin/master --exec "./test-repl.sh" install: skip