From 676abc4d9f32062a3fa21af6b1dd2a2cc7a37a2e Mon Sep 17 00:00:00 2001 From: "geo-ghci-int[bot]" <146321879+geo-ghci-int[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:38:02 +0000 Subject: [PATCH] Update from base branch From the artifact of the previous workflow run --- .UPGRADE_INSTRUCTIONS | 6 -- .upgrade.yaml | 67 -------------------- create.diff | 29 --------- upgrade | 143 ------------------------------------------ 4 files changed, 245 deletions(-) delete mode 100644 .UPGRADE_INSTRUCTIONS delete mode 100644 .upgrade.yaml delete mode 100644 create.diff delete mode 100755 upgrade diff --git a/.UPGRADE_INSTRUCTIONS b/.UPGRADE_INSTRUCTIONS deleted file mode 100644 index 81e52e87b..000000000 --- a/.UPGRADE_INSTRUCTIONS +++ /dev/null @@ -1,6 +0,0 @@ -The `create.diff` file is a recommendation of the changes that you should apply to your project. -You should apply the changes shown in the diff file on `CONST_create_template/` on your project's ``. -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/ `).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. -Note that you can also apply them using: git apply --3way create.diff -To continue, type: -./upgrade 2.9 11 diff --git a/.upgrade.yaml b/.upgrade.yaml deleted file mode 100644 index 2620cdf4d..000000000 --- a/.upgrade.yaml +++ /dev/null @@ -1,67 +0,0 @@ ---- -# The list (by include, exclude) of default files that will not be overwritten by the upgrade. -# That that can be extended with managed_files or reduced with unmanaged_files from the -# project.yaml file in the project root directory. -default_project_file: - include: - - geoportal/setup\.py - - geoportal/vars\.yaml - - geoportal/Makefile - - geoportal/geomapfish_geoportal/__init__\.py - - geoportal/geomapfish_geoportal/templates/.* - - geoportal/geomapfish_geoportal/locale/.* - - geoportal/geomapfish_geoportal/static/.* - - geoportal/geomapfish_geoportal/static-ngeo/.* - - print/print-apps/.* - - mapserver/.* - - tilegeneration/config\.yaml\.tmpl - - project\.yaml - - docker-compose\.yaml - - env\.project - - README\.rst - - \.github/workflows/main\.yaml - - \.github/workflows/rebuild\.yaml - exclude: - - mapserver/demo\.map\.tmpl - - geoportal/geomapfish_geoportal/static-ngeo/js/apps/image/favicon\.ico - -# Files ignored when creating the diff files => will just be left untouched. -no_diff: - - .*\.po - - CONST_.+ - - .*/CONST_.+ - -# Files that will be present in the CONST_create_template but will not be considered in the upgrade. -# Used to provide the alt applications => does not disturb the user during upgrade. -extra: - - geoportal/geomapfish_geoportal/static-ngeo/js/apps/mobile_alt\.html\.ejs - - geoportal/geomapfish_geoportal/static-ngeo/js/apps/oeedit\.html\.ejs - - geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controllermobile_alt\.js - - geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controlleroeedit\.js - - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/mobile_alt\.scss - - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/vars_mobile_alt\.scss - - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/oeedit\.scss - - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/vars_oeedit\.scss - - geoportal/interfaces/desktop_alt\.html\.mako - - geoportal/geomapfish_geoportal/static/images/background-layer-button\.png - - tests/test_testapp.py - -# Automated file system operations: -# Remove some files or directories: -# - action: remove -# paths: -# - -# Move a file: -# - action: move -# from: -# to: -upgrade_files: - - action: remove - paths: - - geoportal/tools/extract-messages.js - - action: move - from: geoportal/lingua-server.cfg - to: geoportal/lingva-server.cfg - - action: move - from: geoportal/lingua-client.cfg - to: geoportal/lingva-client.cfg diff --git a/create.diff b/create.diff deleted file mode 100644 index 398b8ad00..000000000 --- a/create.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml -index 415de6d..7d1f9ee 100644 ---- a/.github/workflows/main.yaml -+++ b/.github/workflows/main.yaml -@@ -26,8 +26,12 @@ jobs: - # patterns: docker - # if: env.HAS_SECRETS == 'HAS_SECRETS' - -- - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH} -- - run: python3 -m pip install --user --requirement=ci/requirements.txt -+ - uses: actions/setup-python@v5 -+ with: -+ python-version: '3.11' -+ - run: python3 -m pip install --requirement=ci/requirements.txt -+ - name: Environment information -+ run: c2cciutils-env - - - uses: actions/cache@v4 - with: -@@ -48,9 +52,6 @@ jobs: - # - run: make secrets - # - run: cat env.secrets |grep '^[# A-Z0-9_]\+='|sed -e 's/^[# A-Z0-9_]\+=\(.*\)/::add-mask::\1/g' - -- - name: Environment information -- run: c2cciutils-env -- - # - name: Initialize the acceptance tests - # run: make acceptance-init - # - run: c2cciutils-docker-logs diff --git a/upgrade b/upgrade deleted file mode 100755 index c52341095..000000000 --- a/upgrade +++ /dev/null @@ -1,143 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright (c) 2019-2023, Camptocamp SA -# All rights reserved. - -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: - -# 1. Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# The views and conclusions contained in the software and documentation are those -# of the authors and should not be interpreted as representing official policies, -# either expressed or implied, of the FreeBSD Project. - - -import argparse -import os -import platform -import re -import subprocess -import sys - -parser = argparse.ArgumentParser(description="Upgrade the project") -parser.add_argument( - "--debug", help="Path to c2cgeoportal source folder to be able to debug the upgrade procedure" -) -parser.add_argument("version", help="the version to upgrade to (master or x.y.z)") -parser.add_argument("step", nargs="?", help="the step to run") -parser_finalize = argparse.ArgumentParser(description="Upgrade the project", add_help=False) -parser_finalize.add_argument("--finalize", action="store_true", help="finalize the upgrade") -parser_finalize.add_argument("--help", action="help", help="show this help message and exit") -parser_finalize.add_argument("build_arg", nargs="*", help="build arguments") - -if len(sys.argv) >= 2 and sys.argv[1] == "--finalize": - args = parser_finalize.parse_args() - - if platform.system() == "Windows": - code = subprocess.call(["python", "build"] + args.build_arg) - else: - code = subprocess.call(["./build"] + args.build_arg) - if code != 0: - sys.exit(code) - - subprocess.call(["docker", "compose", "down", "--remove-orphans"]) - subprocess.call( - ["docker", "compose", "pull", "--ignore-pull-failures"], - env={**os.environ, "DOCKER_TAG": "unexisting"}, - ) - subprocess.check_call(["docker", "compose", "up", "-d"]) - subprocess.check_call( - [ - "docker", - "compose", - "exec", - "geoportal", - "alembic", - "--name=main", - "--config=alembic.ini", - "upgrade", - "head", - ] - ) - -else: - args = parser.parse_args() - - c2cupgrade_args = ["--step", args.step] if args.step is not None else [] - - if os.environ.get("CI") != "true" and args.step is None: - major_version = args.version - match = re.match(r"^([0-9]+\.[0-9]+)\.[0-9]+$", args.version) - if match is not None: - major_version = match.group(1) - match = re.match(r"^([0-9]+\.[0-9]+)\.[0-9a-z]+\.[0-9]+$", args.version) - if match is not None: - major_version = match.group(1) - if not args.debug: - subprocess.check_call( - [ - "docker", - "pull", - f"camptocamp/geomapfish:{major_version}", - ] - ) - subprocess.check_call(["docker", "pull", f"camptocamp/geomapfish-tools:{args.version}"]) - subprocess.check_call( - [ - "docker", - "pull", - f"camptocamp/geomapfish-config:{major_version}", - ] - ) - - debug_volumes = ( - [ - "--volume={debug}/geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py:".format( - debug=args.debug - ), - "/opt/c2cgeoportal/geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py", - ] - if args.debug - else [] - ) - - win = platform.system() == "Windows" - sys.exit( - subprocess.call( - [ - "docker", - "run", - "--rm", - "--env=CI", - f"--volume={os.getcwd()}:/src", - ] - + debug_volumes - + [ - f"camptocamp/geomapfish-tools:{args.version}", - "run-git", - subprocess.check_output(["git", "config", "--get", "user.name"]).decode().strip(), - subprocess.check_output(["git", "config", "--get", "user.email"]).decode().strip(), - "" if win else subprocess.check_output(["id", "-u"]).decode().strip(), - "" if win else subprocess.check_output(["id", "-g"]).decode().strip(), - "/src", - "c2cupgrade", - ] - + c2cupgrade_args - ) - )