Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade failed #1473

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONST_create_template/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONST_create_template/ci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c2cciutils[checks,publish]==1.4.20
c2cciutils[checks,publish]==1.4.21
2 changes: 1 addition & 1 deletion CONST_create_template/env.default
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONST_create_template/geoportal/webpack.apps.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}',
},
})
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c2cciutils[checks,publish]==1.4.20
c2cciutils[checks,publish]==1.4.21
2 changes: 1 addition & 1 deletion env.default
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion geoportal/webpack.apps.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}',
},
})
Expand Down
Loading