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 6.0.4 and Volto 16.20.4 #15

Merged
merged 2 commits into from
Apr 27, 2023
Merged

Upgrade to 6.0.4 and Volto 16.20.4 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c44d5af
Upgrade to 6.0.4
pbauer Apr 26, 2023
1b761f5
Update to latest Volto 16
pbauer Apr 26, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
env:
node-version: 16.x
python: "3.11"
plone: "6.0.3"
plone: "6.0.4"

jobs:

Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG SEED=1000
ARG PLONE_VERSION=6.0.3
ARG PLONE_VERSION=6.0.4
FROM plone/plone-backend:${PLONE_VERSION}


Expand Down
2 changes: 1 addition & 1 deletion backend/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ GREEN=`tput setaf 2`
RESET=`tput sgr0`
YELLOW=`tput setaf 3`

PLONE_VERSION=6.0.3
PLONE_VERSION=6.0.4

BACKEND_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))

Expand Down
2 changes: 1 addition & 1 deletion backend/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-c https://dist.plone.org/release/6.0.3/constraints.txt
-c https://dist.plone.org/release/6.0.4/constraints.txt
2 changes: 1 addition & 1 deletion classic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG SEED=1000
ARG PLONE_VERSION=6.0.3
ARG PLONE_VERSION=6.0.4
FROM plone/plone-backend:${PLONE_VERSION}
ENV zope_i18n_compile_mo_files=true

Expand Down
2 changes: 1 addition & 1 deletion classic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ GREEN=`tput setaf 2`
RESET=`tput sgr0`
YELLOW=`tput setaf 3`

PLONE_VERSION=6.0.3
PLONE_VERSION=6.0.4

BACKEND_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))

Expand Down
2 changes: 1 addition & 1 deletion classic/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-c https://dist.plone.org/release/6.0.3/constraints.txt
-c https://dist.plone.org/release/6.0.4/constraints.txt
4 changes: 2 additions & 2 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@
"node": "^14 || ^16"
},
"dependencies": {
"@kitconcept/volto-blocks-grid": "6.1.0",
"@plone/volto": "16.9.0"
"@kitconcept/volto-blocks-grid": "7.0.0",
"@plone/volto": "16.20.4"
},
"devDependencies": {
"@plone/scripts": "^2.3.0",
Expand Down
3,831 changes: 2,145 additions & 1,686 deletions frontend/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.