diff --git a/CONST_create_template/Makefile b/CONST_create_template/Makefile index ae6d8ca4a..bfdcbb73f 100644 --- a/CONST_create_template/Makefile +++ b/CONST_create_template/Makefile @@ -61,7 +61,7 @@ acceptance-init: ## Initialize the acceptance tests docker-compose exec -T tools wait-db docker-compose exec -T tools psql --command="DROP EXTENSION IF EXISTS postgis CASCADE" scripts/db-restore --docker-compose-file=docker-compose.yaml --docker-compose-file=docker-compose-db.yaml \ - --arg=--clean --arg=--if-exists --arg=--verbose $(DUMP_FILE) + --arg=--clean --arg=--if-exists --arg=--verbose $(DUMP_FILE) || true docker-compose --file=docker-compose.yaml --file=docker-compose-db.yaml up -d .PHONY: acceptance diff --git a/CONST_create_template/ci/requirements.txt b/CONST_create_template/ci/requirements.txt index cb37deb51..4b09822b0 100644 --- a/CONST_create_template/ci/requirements.txt +++ b/CONST_create_template/ci/requirements.txt @@ -1 +1 @@ -c2cciutils[checks,publish]==1.4.20 +c2cciutils[checks,publish]==1.4.21 diff --git a/CONST_create_template/env.default b/CONST_create_template/env.default index 9336b482a..b5934683d 100644 --- a/CONST_create_template/env.default +++ b/CONST_create_template/env.default @@ -1,5 +1,5 @@ # Default values for c2cgeoportal -GEOMAPFISH_VERSION=2.8.1.151 +GEOMAPFISH_VERSION=2.8.1.154 GEOMAPFISH_MAIN_VERSION=2.8 GEOMAPFISH_MAIN_MINOR_VERSION=2.8.1 COMPOSE_PROJECT_NAME=geomapfish diff --git a/CONST_create_template/geoportal/webpack.apps.js b/CONST_create_template/geoportal/webpack.apps.js index 8f0722e72..81fd25460 100644 --- a/CONST_create_template/geoportal/webpack.apps.js +++ b/CONST_create_template/geoportal/webpack.apps.js @@ -21,7 +21,7 @@ for (const filename of ls(path.resolve(__dirname, 'geomapfish_geoportal/static-n chunks: [name], vars: { entry_point: '${VISIBLE_ENTRY_POINT}', - version: '2.8.1.151', + version: '2.8.1.154', cache_version: '${CACHE_VERSION}', }, }) diff --git a/Makefile b/Makefile index 4b48202fd..00f2465c1 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ acceptance-init: ## Initialize the acceptance tests docker compose exec -T tools psql --command='CREATE EXTENSION IF NOT EXISTS pg_trgm' docker compose exec -T tools psql --command='CREATE EXTENSION IF NOT EXISTS hstore' scripts/db-restore --docker-compose-version-2 --docker-compose-file=docker-compose.yaml --docker-compose-file=docker-compose-db.yaml \ - --arg=--clean --arg=--if-exists --arg=--verbose --arg=--no-privileges --arg=--no-owner $(DUMP_FILE) + --arg=--clean --arg=--if-exists --arg=--verbose --arg=--no-privileges --arg=--no-owner $(DUMP_FILE) || true docker compose --file=docker-compose.yaml --file=docker-compose-db.yaml up -d .PHONY: acceptance diff --git a/ci/requirements.txt b/ci/requirements.txt index cb37deb51..4b09822b0 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1 +1 @@ -c2cciutils[checks,publish]==1.4.20 +c2cciutils[checks,publish]==1.4.21 diff --git a/env.default b/env.default index 9336b482a..b5934683d 100644 --- a/env.default +++ b/env.default @@ -1,5 +1,5 @@ # Default values for c2cgeoportal -GEOMAPFISH_VERSION=2.8.1.151 +GEOMAPFISH_VERSION=2.8.1.154 GEOMAPFISH_MAIN_VERSION=2.8 GEOMAPFISH_MAIN_MINOR_VERSION=2.8.1 COMPOSE_PROJECT_NAME=geomapfish diff --git a/geoportal/webpack.apps.js b/geoportal/webpack.apps.js index 8f0722e72..81fd25460 100644 --- a/geoportal/webpack.apps.js +++ b/geoportal/webpack.apps.js @@ -21,7 +21,7 @@ for (const filename of ls(path.resolve(__dirname, 'geomapfish_geoportal/static-n chunks: [name], vars: { entry_point: '${VISIBLE_ENTRY_POINT}', - version: '2.8.1.151', + version: '2.8.1.154', cache_version: '${CACHE_VERSION}', }, })