Skip to content

Commit ef2e208

Browse files
author
Continuous integration
committed
Interrupted upgrade to master
1 parent cdb809d commit ef2e208

14 files changed

Lines changed: 274 additions & 10 deletions

‎.UPGRADE_INSTRUCTIONS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
The `create.diff` file is a recommendation of the changes that you should apply to your project.
2+
You should apply the changes shown in the diff file on `CONST_create_template/<file>` on your project's `<file>`.
3+
Some advice to be more efficient: if the changes on a file concern a file that you never customize, you can simply copy the new file from `CONST_create_template` (`cp CONST_create_template/<file> <file>`).You can furthermore add this file to the `unmanaged_files` section of the `project.yaml` file, to avoid its contents appearing in the diff file for the next upgrade.
4+
Note that you can also apply them using: git apply --3way create.diff
5+
To continue, type:
6+
./upgrade 2.10 11

‎.upgrade.yaml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
---
2+
# The list (by include, exclude) of default files that will not be overwritten by the upgrade.
3+
# That that can be extended with managed_files or reduced with unmanaged_files from the
4+
# project.yaml file in the project root directory.
5+
default_project_file:
6+
include:
7+
- geoportal/setup\.py
8+
- geoportal/vars\.yaml
9+
- geoportal/Makefile
10+
- geoportal/geomapfish_geoportal/__init__\.py
11+
- geoportal/geomapfish_geoportal/templates/.*
12+
- geoportal/geomapfish_geoportal/locale/.*
13+
- geoportal/geomapfish_geoportal/static/.*
14+
- geoportal/geomapfish_geoportal/static-ngeo/.*
15+
- print/print-apps/.*
16+
- mapserver/.*
17+
- tilegeneration/config\.yaml\.tmpl
18+
- project\.yaml
19+
- docker-compose\.yaml
20+
- env\.project
21+
- README\.rst
22+
- \.github/workflows/main\.yaml
23+
- \.github/workflows/rebuild\.yaml
24+
exclude:
25+
- mapserver/demo\.map\.tmpl
26+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/image/favicon\.ico
27+
28+
# Files ignored when creating the diff files => will just be left untouched.
29+
no_diff:
30+
- .*\.po
31+
- CONST_.+
32+
- .*/CONST_.+
33+
34+
# Files that will be present in the CONST_create_template but will not be considered in the upgrade.
35+
# Used to provide the alt applications => does not disturb the user during upgrade.
36+
extra:
37+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/mobile_alt\.html\.ejs
38+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/oeedit\.html\.ejs
39+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controllermobile_alt\.js
40+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controlleroeedit\.js
41+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/mobile_alt\.scss
42+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/vars_mobile_alt\.scss
43+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/oeedit\.scss
44+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/vars_oeedit\.scss
45+
- geoportal/interfaces/desktop_alt\.html\.mako
46+
- geoportal/geomapfish_geoportal/static/images/background-layer-button\.png
47+
- tests/test_testapp.py
48+
49+
# Automated file system operations:
50+
# Remove some files or directories:
51+
# - action: remove
52+
# paths:
53+
# - <one file or directory>
54+
# Move a file:
55+
# - action: move
56+
# from: <src file>
57+
# to: <dst file>
58+
upgrade_files:
59+
- action: remove
60+
paths:
61+
- geoportal/tools/extract-messages.js
62+
- action: move
63+
from: geoportal/lingua-server.cfg
64+
to: geoportal/lingva-server.cfg
65+
- action: move
66+
from: geoportal/lingua-client.cfg
67+
to: geoportal/lingva-client.cfg
68+
- action: remove
69+
paths:
70+
- geoportal/.CONST_vars.yaml.swp
71+
- action: remove
72+
paths:
73+
- geoportal/.eslintrc.yaml
74+
- action: move
75+
from: ci/config.yaml
76+
to: .github/publish.yaml

‎CONST_create_template/docker-compose-db.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ services:
2121
file: docker-compose-lib.yaml
2222
service: db
2323
volumes:
24-
- postgresql_data:/var/lib/postgresql/data
24+
- postgresql_data:/var/lib/postgresql

‎CONST_create_template/docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ services:
118118
# file: docker-compose-lib.yaml
119119
# service: db
120120
# volumes:
121-
# - postgresql_data:/var/lib/postgresql/data
121+
# - postgresql_data:/var/lib/postgresql

‎CONST_create_template/env.default‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ MAPSERVER_URL=http://mapserver:8080/
5252
TINYOWS_URL=http://tinyows:8080/
5353
QGISSERVER_URL=http://qgisserver:8080/
5454
QGIS_VERSION=4.0-gdal3.13
55-
POSTGRES_TAG=17-postgis-3
55+
POSTGRES_TAG=18-postgis-3
5656

5757
DEVSERVER_HOST=webpack_dev_server:8080
5858
REDIS_SERVICENAME=mymaster

‎create.diff‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/docker-compose-db.yaml b/docker-compose-db.yaml
2+
index 800dc87..b82eb6b 100644
3+
--- a/docker-compose-db.yaml
4+
+++ b/docker-compose-db.yaml
5+
@@ -21,4 +21,4 @@ services:
6+
file: docker-compose-lib.yaml
7+
service: db
8+
volumes:
9+
- - postgresql_data:/var/lib/postgresql/data
10+
+ - postgresql_data:/var/lib/postgresql
11+
diff --git a/docker-compose.yaml b/docker-compose.yaml
12+
index 748dd40..537200f 100644
13+
--- a/docker-compose.yaml
14+
+++ b/docker-compose.yaml
15+
@@ -118,4 +118,4 @@ services:
16+
# file: docker-compose-lib.yaml
17+
# service: db
18+
# volumes:
19+
- # - postgresql_data:/var/lib/postgresql/data
20+
+ # - postgresql_data:/var/lib/postgresql

‎docker-compose-db.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ services:
2121
file: docker-compose-lib.yaml
2222
service: db
2323
volumes:
24+
<<<<<<< ours
2425
- postgresql_data:/var/lib/postgresql/data
2526

2627
alembic-main:
@@ -37,3 +38,6 @@ services:
3738
- PGHOST_SLAVE=db
3839
- PGSSLMODE=prefer
3940
- PGSCHEMA
41+
=======
42+
- postgresql_data:/var/lib/postgresql
43+
>>>>>>> theirs

‎docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,4 @@ services:
170170
# file: docker-compose-lib.yaml
171171
# service: db
172172
# volumes:
173-
# - postgresql_data:/var/lib/postgresql/data
173+
# - postgresql_data:/var/lib/postgresql

‎env.default‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ MAPSERVER_URL=http://mapserver:8080/
5252
TINYOWS_URL=http://tinyows:8080/
5353
QGISSERVER_URL=http://qgisserver:8080/
5454
QGIS_VERSION=4.0-gdal3.13
55-
POSTGRES_TAG=17-postgis-3
55+
POSTGRES_TAG=18-postgis-3
5656

5757
DEVSERVER_HOST=webpack_dev_server:8080
5858
REDIS_SERVICENAME=mymaster

‎geoportal/CONST_vars.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ vars:
221221
width: 20
222222
height: 20
223223
# Delay in milliseconds before recomputing the map scale for GetLegendGraphic requests.
224-
# Set to 200ms to execute after GetMap requests (debounceDelay: 100ms).
224+
# Set to 200ms to execute after GetMap requests (debounceDelay: 1s).
225225
# To optimize repeated zoom operations.
226-
legendDebounceDelay: 200
226+
legendDebounceDelay: 1000
227227
gmfDisclaimerOptions: {}
228228
gmfBackgroundLayerSelectorOptions: {}
229229
defaultTheme: Demo

0 commit comments

Comments
 (0)