Skip to content

Commit 1a051c8

Browse files
committed
Merge branch 'volto-light-theme-merge' into merge-addons
* volto-light-theme-merge: (682 commits) Merge volto-light-theme Release 7.0.0a15 Move all listing template to use Card component (#601) Fix acceptance tests Spanish translations (#598) Block Model 3 structural changes as opt-in in VLT6 (#532) Revert "Add docs for cypress" (#607) Add docs for cypress (#605) Fixed the use case where the sticky menu item is allowed to not have link (#606) Rename fields in the `kitconcept.footer` behavior (#603) Release 7.0.0a14 Add acceptance test for grid block(Image and listing ones) (#599) Added main footer logo inversed version. (#600) Calendar block for event content type. (#588) Fix sticky menu background color problems (#594) Adjust margins for narrow center image (#587) Show dates for news item on mobile & show kicker before dates (#589) Fixpersonteaserselectionfirsttime (#586) Release 7.0.0a12 Changelog ...
2 parents bb80530 + c489419 commit 1a051c8

File tree

887 files changed

+120027
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

887 files changed

+120027
-0
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
2+
# EditorConfig Configuration file, for more details see:
3+
# https://EditorConfig.org
4+
# EditorConfig is a convention description, that could be interpreted
5+
# by multiple editors to enforce common coding conventions for specific
6+
# file types
7+
8+
# top-most EditorConfig file:
9+
# Will ignore other EditorConfig files in Home directory or upper tree level.
10+
root = true
11+
12+
13+
[*] # For All Files
14+
# Unix-style newlines with a newline ending every file
15+
end_of_line = lf
16+
insert_final_newline = true
17+
trim_trailing_whitespace = true
18+
# Set default charset
19+
charset = utf-8
20+
# Indent style default
21+
indent_style = space
22+
23+
[*.{py,cfg,ini}]
24+
# 4 space indentation
25+
indent_size = 4
26+
27+
[*.{html,dtml,pt,zpt,xml,zcml,js,json,ts,less,scss,css,sass,yml,yaml}]
28+
# 2 space indentation
29+
indent_size = 2
30+
31+
[{Makefile,.gitmodules}]
32+
# Tab indentation (no size specified, but view as 4 spaces)
33+
indent_style = tab
34+
indent_size = unset
35+
tab_width = unset
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Backend Test Coverage
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
python-version:
7+
required: true
8+
type: string
9+
plone-version:
10+
required: true
11+
type: string
12+
13+
defaults:
14+
run:
15+
working-directory: backend
16+
17+
env:
18+
PLONE_VERSION: ${{ inputs.plone-version }}
19+
20+
jobs:
21+
22+
coverage:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v4
27+
28+
- name: Install the latest version of uv
29+
uses: astral-sh/setup-uv@v5
30+
with:
31+
python-version: ${{ inputs.python-version }}
32+
enable-cache: false
33+
34+
- name: Restore uv cache
35+
uses: actions/cache@v4
36+
with:
37+
path: /tmp/.uv-cache
38+
key: uv-${{ runner.os }}-${{ inputs.python-version }}-${{ inputs.plone-version }}-${{ hashFiles('pyproject.toml') }}
39+
restore-keys: |
40+
uv-${{ runner.os }}-${{ inputs.python-version }}-${{ inputs.plone-version }}-${{ hashFiles('pyproject.toml') }}
41+
uv-${{ runner.os }}-${{ inputs.python-version }}-${{ inputs.plone-version }}
42+
43+
- name: Install Plone and package
44+
run: make install
45+
46+
- name: Run tests
47+
run: make test-coverage
48+
49+
- name: Report Coverage
50+
run: |
51+
echo "# Coverage Report" >> $GITHUB_STEP_SUMMARY
52+
echo "$(uv run coverage report --format markdown)" >> $GITHUB_STEP_SUMMARY
Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
name: Backend Image Generation
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
base-tag:
7+
required: true
8+
type: string
9+
image-name-prefix:
10+
required: true
11+
type: string
12+
image-name-suffix:
13+
required: true
14+
type: string
15+
plone-version:
16+
required: true
17+
type: string
18+
19+
defaults:
20+
run:
21+
working-directory: backend
22+
23+
jobs:
24+
25+
build:
26+
runs-on: ubuntu-latest
27+
permissions:
28+
contents: read
29+
packages: write
30+
31+
steps:
32+
33+
- name: Checkout
34+
uses: actions/checkout@v4
35+
36+
- name: Set up QEMU
37+
uses: docker/setup-qemu-action@v3
38+
39+
- name: Set up Docker Buildx
40+
uses: docker/setup-buildx-action@v3
41+
42+
- name: Docker meta
43+
id: meta
44+
uses: docker/metadata-action@v5
45+
with:
46+
images: |
47+
${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}
48+
labels: |
49+
org.label-schema.docker.cmd=docker run -d -p 8080:8080 ${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}:${{ inputs.base-tag }}
50+
flavor:
51+
latest=false
52+
tags: |
53+
type=raw,value=${{ inputs.base-tag }}
54+
55+
- name: Login to Container Registry
56+
uses: docker/login-action@v3
57+
with:
58+
registry: ghcr.io
59+
username: ${{ github.actor }}
60+
password: ${{ secrets.GITHUB_TOKEN }}
61+
62+
- name: Build Image
63+
uses: docker/build-push-action@v6
64+
with:
65+
platforms: linux/amd64
66+
context: backend/
67+
file: backend/Dockerfile
68+
tags: ${{ steps.meta.outputs.tags }}
69+
labels: ${{ steps.meta.outputs.labels }}
70+
push: true
71+
cache-from: type=registry,ref=${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}:buildcache-${{ github.ref_name }}
72+
cache-to: type=registry,ref=${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}:buildcache-${{ inputs.base-tag }},mode=max
73+
build-args: |
74+
PLONE_VERSION=${{ inputs.plone-version }}
75+
SEED=$GITHUB_RUN_ID
76+
77+
build-acceptance:
78+
runs-on: ubuntu-latest
79+
permissions:
80+
contents: read
81+
packages: write
82+
83+
steps:
84+
85+
- name: Checkout
86+
uses: actions/checkout@v4
87+
88+
- name: Set up QEMU
89+
uses: docker/setup-qemu-action@v3
90+
91+
- name: Set up Docker Buildx
92+
uses: docker/setup-buildx-action@v3
93+
94+
- name: Docker meta
95+
id: meta
96+
uses: docker/metadata-action@v5
97+
with:
98+
images: |
99+
${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}-acceptance
100+
labels: |
101+
org.label-schema.docker.cmd=docker run -d -p 8080:8080 ${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}-acceptance:${{ inputs.base-tag }}
102+
flavor:
103+
latest=false
104+
tags: |
105+
type=raw,value=${{ inputs.base-tag }}
106+
107+
- name: Login to Container Registry
108+
uses: docker/login-action@v3
109+
with:
110+
registry: ghcr.io
111+
username: ${{ github.actor }}
112+
password: ${{ secrets.GITHUB_TOKEN }}
113+
114+
- name: Build Image
115+
uses: docker/build-push-action@v6
116+
with:
117+
platforms: linux/amd64
118+
context: backend/
119+
file: backend/Dockerfile.acceptance
120+
tags: ${{ steps.meta.outputs.tags }}
121+
labels: ${{ steps.meta.outputs.labels }}
122+
push: true
123+
cache-from: type=registry,ref=${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}-acceptance:buildcache-${{ github.ref_name }}
124+
cache-to: type=registry,ref=${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}-acceptance:buildcache-${{ inputs.base-tag }},mode=max
125+
build-args: |
126+
PLONE_VERSION=${{ inputs.plone-version }}
127+
SEED=$GITHUB_RUN_ID
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Backend Image Generation
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
base-tag:
7+
required: true
8+
type: string
9+
image-name-prefix:
10+
required: true
11+
type: string
12+
image-name-suffix:
13+
required: true
14+
type: string
15+
plone-version:
16+
required: true
17+
type: string
18+
push:
19+
required: true
20+
type: boolean
21+
22+
23+
jobs:
24+
25+
release:
26+
runs-on: ubuntu-latest
27+
permissions:
28+
contents: read
29+
packages: write
30+
31+
steps:
32+
- uses: actions/checkout@v4
33+
34+
- name: Set up QEMU
35+
uses: docker/setup-qemu-action@v3
36+
37+
- name: Set up Docker Buildx
38+
uses: docker/setup-buildx-action@v3
39+
40+
- name: Docker meta
41+
id: meta
42+
uses: docker/metadata-action@v5
43+
with:
44+
images: |
45+
${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}
46+
labels: |
47+
org.label-schema.docker.cmd=docker run -d -p 8080:8080 ${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}:${{ inputs.base-tag }}
48+
flavor:
49+
latest=false
50+
tags: |
51+
type=ref,event=branch
52+
type=sha
53+
type=raw,value=${{ inputs.base-tag }}
54+
type=pep440,pattern={{version}}
55+
type=pep440,pattern={{major}}.{{minor}}
56+
type=pep440,pattern={{major}}
57+
type=raw,value=latest,enable={{is_default_branch}}
58+
59+
- name: Login to Container Registry
60+
uses: docker/login-action@v3
61+
with:
62+
registry: ghcr.io
63+
username: ${{ github.actor }}
64+
password: ${{ secrets.GITHUB_TOKEN }}
65+
66+
- name: Push Image to Registry
67+
uses: docker/build-push-action@v6
68+
with:
69+
platforms: linux/amd64
70+
context: backend/
71+
file: backend/Dockerfile
72+
push: ${{ inputs.push }}
73+
tags: ${{ steps.meta.outputs.tags }}
74+
labels: ${{ steps.meta.outputs.labels }}
75+
cache-from: type=registry,ref=${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}:buildcache-${{ inputs.base-tag }}
76+
cache-to: type=registry,ref=${{ inputs.image-name-prefix }}-${{ inputs.image-name-suffix }}:buildcache-${{ github.ref_name }},mode=max
77+
build-args: |
78+
PLONE_VERSION=${{ inputs.plone-version }}
79+
SEED=$GITHUB_RUN_ID
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Backend Lint
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
python-version:
7+
required: true
8+
type: string
9+
plone-version:
10+
required: true
11+
type: string
12+
13+
defaults:
14+
run:
15+
working-directory: backend
16+
17+
jobs:
18+
19+
lint:
20+
runs-on: ubuntu-latest
21+
steps:
22+
23+
- name: Checkout
24+
uses: actions/checkout@v4
25+
26+
- name: Install the latest version of uv
27+
uses: astral-sh/setup-uv@v5
28+
with:
29+
python-version: ${{ inputs.python-version }}
30+
31+
- name: Check formatting
32+
if: ${{ success() || failure() }}
33+
id: ruff-format
34+
run: uvx ruff@latest format --diff
35+
36+
- name: Check lint
37+
if: ${{ success() || failure() }}
38+
id: ruff-lint
39+
run: uvx ruff@latest check --diff
40+
41+
- name: Check XML / ZCML
42+
if: ${{ success() || failure() }}
43+
id: zpretty
44+
run: uvx zpretty@latest --check src
45+
46+
- name: Check Package Metadata
47+
if: ${{ success() || failure() }}
48+
id: pyroma
49+
run: uvx pyroma@latest -d .
50+
51+
- name: Check Python Versions
52+
if: ${{ success() || failure() }}
53+
id: py-versions
54+
run: uvx check-python-versions@latest .
55+
56+
- name: Report
57+
if: ${{ success() || failure() }}
58+
run: |
59+
echo '# Code Analysis' >> $GITHUB_STEP_SUMMARY
60+
echo '| Test | Status |' >> $GITHUB_STEP_SUMMARY
61+
echo '| --- | --- |' >> $GITHUB_STEP_SUMMARY
62+
echo '| Format | ${{ steps.ruff-format.conclusion == 'failure' && '❌' || ' ✅' }} |' >> $GITHUB_STEP_SUMMARY
63+
echo '| Lint | ${{ steps.ruff-lint.conclusion == 'failure' && '❌' || ' ✅' }} |' >> $GITHUB_STEP_SUMMARY
64+
echo '| XML / ZCML | ${{ steps.zpretty.conclusion == 'failure' && '❌' || ' ✅' }} |' >> $GITHUB_STEP_SUMMARY
65+
echo '| Package Metadata | ${{ steps.pyroma.conclusion == 'failure' && '❌' || ' ✅' }} |' >> $GITHUB_STEP_SUMMARY
66+
echo '| Python Versions | ${{ steps.py-versions.conclusion == 'failure' && '❌' || ' ✅' }} |' >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)