From a522934abcbb49a3626b1ec8b3eb397f70bb2715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 15 May 2019 16:57:03 +0200 Subject: [PATCH] Use the latest image --- geoportal/package.json | 2 +- travis/test-upgrade-convert.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/geoportal/package.json b/geoportal/package.json index a41713a943..8c2be03ac4 100644 --- a/geoportal/package.json +++ b/geoportal/package.json @@ -6,6 +6,6 @@ "dependencies": { "eslint-plugin-googshift": "0.9.3", "googshift": "0.9.10", - "ngeo": "2.4.0-latest.20190430T110957Z.1f60833.HEAD" + "ngeo": "version-2.4-latest" } } diff --git a/travis/test-upgrade-convert.sh b/travis/test-upgrade-convert.sh index 390d2015fa..d1abc10f40 100755 --- a/travis/test-upgrade-convert.sh +++ b/travis/test-upgrade-convert.sh @@ -329,6 +329,11 @@ function v240 { git commit --quiet --message="Start upgrade" ./docker-run --env=NODE_ENV make upgrade ./docker-run make --always-make --makefile=CONST_convert2tmpl.mk to-tmpl + if [ -e .UPGRADE9 ] + then + git apply --3way ngeo.diff + ./docker-run --env=NODE_ENV make ${MAKE_ARGS} upgrade10 + fi if [ ! -e .UPGRADE_SUCCESS ] then printdiff