Create branch 2.9

camptocamp · Feb 24, 2023 · 4b1cfdf · 4b1cfdf
1 parent cbe8af6
commit 4b1cfdf
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 16 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -8,7 +8,7 @@
   prHourlyLimit: 0,
   prConcurrentLimit: 0,
   lockFileMaintenance: {enabled: true, automerge: true, schedule: 'on the first day of the month'},
-  baseBranches: ['prod-2-7', 'prod-2-7-advance', 'prod-2-8', 'prod-2-8-advance'],
+  baseBranches: ['prod-2-7', 'prod-2-7-advance', 'prod-2-8', 'prod-2-8-advance', 'prod-2-9', 'prod-2-9-advance'],
   ignorePaths: ['CONST_create_template/**', 'docker-compose-lib.yaml', 'ci/**'],
   packageRules: [
     /** Docker images versioning */

diff --git a/.github/workflows/auto-review.yaml b/.github/workflows/auto-review.yaml
@@ -10,7 +10,7 @@ on:
 jobs:
   auto-merge:
     name: Auto reviews updates
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 5
 
     steps:

diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   backport:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Backport
     timeout-minutes: 5
 

diff --git a/.github/workflows/delete-old-workflows-run.yaml b/.github/workflows/delete-old-workflows-run.yaml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 25
     name: Delete old workflow runs
 

diff --git a/.github/workflows/rebuild.yaml b/.github/workflows/rebuild.yaml
@@ -10,12 +10,12 @@ env:
   # Requires CI_GPG_PRIVATE_KEY and GOPASS_CI_GITHUB_TOKEN secrets.
   OPENSHIFT_PROJECT: gs-gmf-demo
   # The release branches
-  HELM_RELEASE_NAMES: prod-2-8
+  HELM_RELEASE_NAMES: prod-2-8.prod-2-9
   DOCKER_BUILDKIT: '1'
 
 jobs:
   rebuild:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Rebuild
     timeout-minutes: 10
 
@@ -25,6 +25,7 @@ jobs:
         branch:
           - prod-2-7
           - prod-2-8
+          - prod-2-9
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/update_l10n.yaml b/.github/workflows/update_l10n.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   l10n:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     name: Update l10n cron job
     timeout-minutes: 10
 
@@ -19,6 +19,8 @@ jobs:
             base_url: https://geomapfish-demo-2-7.camptocamp.com/
           - branch: prod-2-8
             base_url: https://geomapfish-demo-2-8.camptocamp.com/
+          - branch: prod-2-9
+            base_url: https://geomapfish-demo-2-8.camptocamp.com/
 
     steps:
       - uses: actions/checkout@v3

diff --git a/env.default b/env.default
@@ -1,6 +1,6 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.8
-GEOMAPFISH_MAIN_VERSION=2.8
+GEOMAPFISH_VERSION=2.9
+GEOMAPFISH_MAIN_VERSION=2.9
 COMPOSE_PROJECT_NAME=geomapfish
 PACKAGE=geomapfish
 SRID=2056

diff --git a/env.project b/env.project
@@ -1,7 +1,7 @@
 # Custom project values
 COMPOSE_PROJECT_NAME=demo
 DOCKER_BASE=camptocamp/geomapfishdemo
-DOCKER_TAG=2.8
+DOCKER_TAG=2.9
 
 PGHOST=pg-gs.camptocamp.com
 PGHOST_SLAVE=pg-gs.camptocamp.com

diff --git a/geoportal/geomapfish_geoportal/static/apihelp/data.txt b/geoportal/geomapfish_geoportal/static/apihelp/data.txt
@@ -1,6 +1,6 @@
 id	point	title	description	icon	iconSize	iconOffset
-1	1216300,2553000	Information	Office de l'information<br />Tél: 032 000 00 00<br>Email: <a href="mailto:[email protected]">[email protected]</a><br />Internet: <a href="http://fr.wikipedia.org/wiki/La_Chaux-de-Fonds" target=new>Cliquer ici</a>	https://geomapfish-demo-2-8.camptocamp.com/static/0/img/markers/marker.png	21,25	-10.5,-25
-2	1215600,2554250	Ma première station	Diesel pas cher	https://geomapfish-demo-2-8.camptocamp.com/static/0/img/markers/marker-blue.png	21,25	-10.5,-25
-3	1215864,2552556	Mon parking	C'est celui-là le meilleur.	https://geomapfish-demo-2-8.camptocamp.com/static/0/img/markers/marker-gold.png	21,25	-10.5,-25
-4	1217126,2554489	Mon parking	Ce parking est<br/>le meillleur.	https://geomapfish-demo-2-8.camptocamp.com/static/0/img/markers/marker-gold.png	21,25	-10.5,-25
-5	1217326,2554089	Ma deuxième station	Sans-plomb pas cher.	https://geomapfish-demo-2-8.camptocamp.com/static/0/img/markers/marker-blue.png	21,25	-10.5,-25
+1	1216300,2553000	Information	Office de l'information<br />Tél: 032 000 00 00<br>Email: <a href="mailto:[email protected]">[email protected]</a><br />Internet: <a href="http://fr.wikipedia.org/wiki/La_Chaux-de-Fonds" target=new>Cliquer ici</a>	https://geomapfish-demo-2-9.camptocamp.com/static/0/img/markers/marker.png	21,25	-10.5,-25
+2	1215600,2554250	Ma première station	Diesel pas cher	https://geomapfish-demo-2-9.camptocamp.com/static/0/img/markers/marker-blue.png	21,25	-10.5,-25
+3	1215864,2552556	Mon parking	C'est celui-là le meilleur.	https://geomapfish-demo-2-9.camptocamp.com/static/0/img/markers/marker-gold.png	21,25	-10.5,-25
+4	1217126,2554489	Mon parking	Ce parking est<br/>le meillleur.	https://geomapfish-demo-2-9.camptocamp.com/static/0/img/markers/marker-gold.png	21,25	-10.5,-25
+5	1217326,2554089	Ma deuxième station	Sans-plomb pas cher.	https://geomapfish-demo-2-9.camptocamp.com/static/0/img/markers/marker-blue.png	21,25	-10.5,-25
diff --git a/scripts/upgrade b/scripts/upgrade
@@ -13,7 +13,7 @@ git config user.name "Continuous integration"
 VERSION=$1
 VERSION_UPGRADE=$1
 if [[ "${VERSION_UPGRADE}" == "master" || "${VERSION_UPGRADE}" == "latest" ]]; then
-    VERSION=2.8
+    VERSION=2.9
 fi
 if [[ "${VERSION_UPGRADE}" == "latest" ]]; then
     VERSION_UPGRADE=master