Skip to content

Commit

Permalink
adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
erral committed Nov 8, 2024
1 parent 2a028ff commit d97e78b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
5 changes: 5 additions & 0 deletions project/hooks/post_gen_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
6 changes: 3 additions & 3 deletions project/{{ cookiecutter.__folder_name }}/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
9 changes: 7 additions & 2 deletions sub/project_settings/cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}",
Expand All @@ -36,4 +41,4 @@
],
"__cookieplone_repository_path": "",
"__cookieplone_template": ""
}
}

0 comments on commit d97e78b

Please sign in to comment.