Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Plone 6.1.0 final. #62

Merged
merged 5 commits into from
Feb 8, 2025
Merged

Upgrade to Plone 6.1.0 final. #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
102ff21
Upgrade to Plone 6.1.0 final.
mauritsvanrees Feb 7, 2025
375e1d5
fix corepack
davisagli Feb 8, 2025
8c3de02
changelog
davisagli Feb 8, 2025
86d0723
Update version in more places
davisagli Feb 8, 2025
4a1e1cf
Update setup-plone action
davisagli Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 36 additions & 39 deletions .github/workflows/build_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ name: Build and Deploy demo.plone.org
on:
workflow_dispatch:
schedule:
- cron: '0 */12 * * *'
- cron: "0 */12 * * *"

env:
node-version: 20.x
python: "3.11"
plone: "6.0.14"
node-version: 22.x
python: "3.12"
plone: "6.1.0"

jobs:

config:
runs-on: ubuntu-latest
defaults:
Expand Down Expand Up @@ -43,8 +42,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend'
check: 'black'
base_dir: "backend"
check: "black"

backend-flake8:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -56,8 +55,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend'
check: 'flake8'
base_dir: "backend"
check: "flake8"

backend-isort:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -69,8 +68,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend'
check: 'isort'
base_dir: "backend"
check: "isort"

backend-zpretty:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -82,8 +81,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend'
check: 'zpretty'
base_dir: "backend"
check: "zpretty"

backend-tests:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -97,7 +96,7 @@ jobs:
- uses: actions/checkout@v4

- name: Setup Plone ${{ env.plone }} with Python ${{ env.python }}
uses: plone/setup-plone@v2.0.0
uses: plone/setup-plone@v3.0.0
with:
python-version: ${{ env.python }}
plone-version: ${{ env.plone }}
Expand All @@ -122,8 +121,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend-volto'
check: 'black'
base_dir: "backend-volto"
check: "black"

backend-volto-flake8:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -135,8 +134,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend-volto'
check: 'flake8'
base_dir: "backend-volto"
check: "flake8"

backend-volto-isort:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -148,8 +147,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend-volto'
check: 'isort'
base_dir: "backend-volto"
check: "isort"

backend-volto-zpretty:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -161,8 +160,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend-volto'
check: 'zpretty'
base_dir: "backend-volto"
check: "zpretty"

backend-volto-tests:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -176,7 +175,7 @@ jobs:
- uses: actions/checkout@v4

- name: Setup Plone ${{ env.plone }} with Python ${{ env.python }}
uses: plone/setup-plone@v2.0.0
uses: plone/setup-plone@v3.0.0
with:
python-version: ${{ env.python }}
plone-version: ${{ env.plone }}
Expand All @@ -191,7 +190,6 @@ jobs:
run: |
PYTHONWARNINGS=ignore zope-testrunner --auto-color --auto-progress --test-path src/plone_6_demo_site/src/


classic-black:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
Expand All @@ -202,8 +200,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'classic'
check: 'black'
base_dir: "classic"
check: "black"

classic-flake8:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -215,8 +213,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'classic'
check: 'flake8'
base_dir: "classic"
check: "flake8"

classic-isort:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -228,8 +226,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'classic'
check: 'isort'
base_dir: "classic"
check: "isort"

classic-zpretty:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -241,8 +239,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'classic'
check: 'zpretty'
base_dir: "classic"
check: "zpretty"

frontend-eslint:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -260,7 +258,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -299,7 +297,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -336,7 +334,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -373,7 +371,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -412,7 +410,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -449,7 +447,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -519,7 +517,6 @@ jobs:
file: Dockerfile

steps:

- name: Checkout
uses: actions/checkout@v4

Expand Down
48 changes: 23 additions & 25 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ on:
- ".github/workflows/ci.yml"

env:
node-version: 20.x
python: "3.11"
plone: "6.0.14"
node-version: 22.x
python: "3.12"
plone: "6.1.0"

jobs:

backend-black:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
Expand All @@ -34,8 +33,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend'
check: 'black'
base_dir: "backend"
check: "black"

backend-flake8:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -47,8 +46,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend'
check: 'flake8'
base_dir: "backend"
check: "flake8"

backend-isort:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -60,8 +59,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend'
check: 'isort'
base_dir: "backend"
check: "isort"

backend-zpretty:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -73,8 +72,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'backend'
check: 'zpretty'
base_dir: "backend"
check: "zpretty"

backend-tests:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -88,7 +87,7 @@ jobs:
- uses: actions/checkout@v4

- name: Setup Plone ${{ env.plone }} with Python ${{ env.python }}
uses: plone/setup-plone@v2.0.0
uses: plone/setup-plone@v3.0.0
with:
python-version: ${{ env.python }}
plone-version: ${{ env.plone }}
Expand All @@ -113,8 +112,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'classic'
check: 'black'
base_dir: "classic"
check: "black"

classic-flake8:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -126,8 +125,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'classic'
check: 'flake8'
base_dir: "classic"
check: "flake8"

classic-isort:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -139,8 +138,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'classic'
check: 'isort'
base_dir: "classic"
check: "isort"

classic-zpretty:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -152,8 +151,8 @@ jobs:
- name: Run check
uses: plone/code-analysis-action@v2
with:
base_dir: 'classic'
check: 'zpretty'
base_dir: "classic"
check: "zpretty"

frontend-eslint:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
Expand All @@ -171,7 +170,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -210,7 +209,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand Down Expand Up @@ -247,7 +246,7 @@ jobs:
node-version: ${{ env.node-version }}

- name: Enable corepack
run: corepack enable
run: npm i -g corepack@latest && corepack enable

- name: Get pnpm store directory
shell: bash
Expand All @@ -267,4 +266,3 @@ jobs:

- name: Test
run: make test

4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 2025-02-07

- Update to Plone 6.1.0 @mauritsvanrees @davisagli

# 2024-12-24

- Merry Christmas!
Expand Down
Loading