Merge pull request #1472 from camptocamp/interrupted-upgrade-prod-2-8…

…-2.8.1.154 Upgrade failed
camptocamp · Oct 7, 2024 · ab76ac2 · ab76ac2
2 parents 3ffbe93 + 794aa32
commit ab76ac2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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/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
@@ -1 +1 @@
-c2cciutils[checks,publish]==1.4.20
+c2cciutils[checks,publish]==1.4.21
diff --git 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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c2cciutils[checks,publish]==1.4.20
		c2cciutils[checks,publish]==1.4.21