diff --git a/project/hooks/post_gen_project.py b/project/hooks/post_gen_project.py index 8bd166e..8473fca 100644 --- a/project/hooks/post_gen_project.py +++ b/project/hooks/post_gen_project.py @@ -95,6 +95,11 @@ def generate_sub_project_settings(context: OrderedDict, output_dir: Path): # Use the same base folder folder_name = output_dir.name output_dir = output_dir.parent + import pdb + + pdb.set_trace() + a = 1 + generator.generate_subtemplate( "sub/project_settings", output_dir, folder_name, context ) diff --git a/project/{{ cookiecutter.__folder_name }}/.gitlab-ci.yml b/project/{{ cookiecutter.__folder_name }}/.gitlab-ci.yml index 473dd3d..222fc05 100644 --- a/project/{{ cookiecutter.__folder_name }}/.gitlab-ci.yml +++ b/project/{{ cookiecutter.__folder_name }}/.gitlab-ci.yml @@ -20,10 +20,10 @@ variables: CONTAINER_FRONTEND_RELEASE_IMAGE: $CI_REGISTRY_IMAGE/frontend {%- if cookiecutter.devops_cache == '1' %} CONTAINER_VARNISH_RELEASE_IMAGE: $CI_REGISTRY_IMAGE/varnish - {%- endif} + {%- endif %} check-backend: - stage: test + stage: check before_script: - apk add --no-cache make bash python3 ncurses openssh-client-common git script: @@ -35,7 +35,7 @@ check-backend: check-frontend: image: node:20-alpine - stage: test + stage: check before_script: - apk add --no-cache make bash python3 ncurses openssh-client-common git - corepack enable diff --git a/sub/project_settings/cookiecutter.json b/sub/project_settings/cookiecutter.json index e2d66fd..05ced65 100644 --- a/sub/project_settings/cookiecutter.json +++ b/sub/project_settings/cookiecutter.json @@ -9,7 +9,12 @@ "language_code": "en", "plone_version": "{{ 'No' | latest_plone }}", "github_organization": "collective", - "container_registry": ["github", "docker_hub", "gitlab"], + "container_registry": [ + "github", + "docker_hub", + "gitlab" + ], + "devops_gitlab_deploy": "0", "__version_package": "1.0.0a0", "__npm_package_name": "{{ cookiecutter.frontend_addon_name }}", "__container_registry_prefix": "{{ cookiecutter.container_registry | image_prefix }}", @@ -36,4 +41,4 @@ ], "__cookieplone_repository_path": "", "__cookieplone_template": "" -} +} \ No newline at end of file