aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Dénès2017-07-20 14:33:48 +0200
committerMaxime Dénès2017-07-20 14:33:48 +0200
commit152bc6119aeed902a1f1f22e35e14596c616c93e (patch)
tree6265c54ab2e463ece5d96fe6460764818704b168
parent945d7bfa27b71137d86a4a46aeeced90d4b59303 (diff)
parent4aaeb8abf89d504de44252ee9923bcba1e3eb007 (diff)
Merge PR #877: Travis+4.05.0
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--.travis.yml8
2 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95928d7bd7..8b43d975ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,8 +18,8 @@ variables:
# some useful values
COMPILER_32BIT: "4.02.3+32bit"
- COMPILER_BLEEDING_EDGE: "4.04.1"
- CAMLP5_VER_BLEEDING_EDGE: "6.17"
+ COMPILER_BLEEDING_EDGE: "4.05.0"
+ CAMLP5_VER_BLEEDING_EDGE: "7.01"
TEST_PACKAGES: "time python"
diff --git a/.travis.yml b/.travis.yml
index 500fa990d9..3cd7fdf5e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,8 +95,8 @@ matrix:
- env:
- TEST_TARGET="test-suite"
- - COMPILER="4.04.1"
- - CAMLP5_VER="6.17"
+ - COMPILER="4.05.0"
+ - CAMLP5_VER="7.01"
- EXTRA_CONF="-coqide opt -with-doc yes"
- EXTRA_OPAM="lablgtk-extras hevea"
addons:
@@ -124,8 +124,8 @@ matrix:
- env:
- TEST_TARGET="coqocaml"
- - COMPILER="4.04.1"
- - CAMLP5_VER="6.17"
+ - COMPILER="4.05.0"
+ - CAMLP5_VER="7.01"
- EXTRA_CONF="-coqide opt -warn-error"
- EXTRA_OPAM="lablgtk-extras hevea"
# dummy target