Skip to content

Commit

Permalink
Merge pull request #1630 from camptocamp/interrupted-upgrade-prod-2-9…
Browse files Browse the repository at this point in the history
…-2.9.rc.94

Upgrade failed
  • Loading branch information
sbrunner authored Mar 11, 2025
2 parents 71ebd96 + 77c18dd commit 44dbba1
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 11 deletions.
9 changes: 1 addition & 8 deletions CONST_create_template/ci/config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/master/c2cciutils/schema.json

checks:
codespell: False
required_workflows: False
dependabot_config: False
prospector_config: False
setup: False
# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.7/c2cciutils/schema.json

version:
branch_to_version_re:
Expand Down
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.9.rc.92
GEOMAPFISH_VERSION=2.9.rc.94
GEOMAPFISH_MAIN_VERSION=2.9
GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
COMPOSE_PROJECT_NAME=geomapfish
Expand Down
3 changes: 2 additions & 1 deletion ci/config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.6.23/c2cciutils/schema.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.7/c2cciutils/schema.json

version:
branch_to_version_re:
- from: (prod-[0-9]+-[0-9]+)
Expand Down
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.9.rc.92
GEOMAPFISH_VERSION=2.9.rc.94
GEOMAPFISH_MAIN_VERSION=2.9
GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
COMPOSE_PROJECT_NAME=geomapfish
Expand Down
1 change: 1 addition & 0 deletions geoportal/CONST_vars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,7 @@ vars:
relevant_for:
- layer_wmts
- layer_cog
- layer_wms
- name: printLayers
description: >
Comma-separated list of WMS layers used instead of the WMTS layer for printing.
Expand Down

0 comments on commit 44dbba1

Please sign in to comment.