diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 60a8e8d..4be628a 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -80,8 +80,7 @@ jobs: with: filters: | acceptance: - - '.github/workflows/backend*' - - '.github/workflows/frontend*' + - '.github/workflows/*' - 'backend/**' - 'frontend/**' backend: diff --git a/backend/Dockerfile b/backend/Dockerfile index e804f3a..37c72b9 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG PLONE_VERSION=6.1.1 +ARG PLONE_VERSION=6.1.3 FROM plone/server-builder:${PLONE_VERSION} AS builder WORKDIR /app diff --git a/backend/Dockerfile.acceptance b/backend/Dockerfile.acceptance index d71a09b..0178077 100644 --- a/backend/Dockerfile.acceptance +++ b/backend/Dockerfile.acceptance @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG PLONE_VERSION=6.1.1 +ARG PLONE_VERSION=6.1.3 FROM plone/server-builder:${PLONE_VERSION} AS builder WORKDIR /app diff --git a/backend/news/+packaging.internal b/backend/news/+packaging.internal new file mode 100644 index 0000000..4659c4c --- /dev/null +++ b/backend/news/+packaging.internal @@ -0,0 +1 @@ +Remove duplicated license information from trove classifiers. @ericof diff --git a/backend/news/24.internal b/backend/news/24.internal new file mode 100644 index 0000000..fa9a231 --- /dev/null +++ b/backend/news/24.internal @@ -0,0 +1 @@ +Use Products.CMFPlone 6.1.3 by default. @ericof diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 67397ea..03e3f60 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -19,7 +19,6 @@ classifiers = [ "Framework :: Plone","Framework :: Plone :: 6.0", "Framework :: Plone","Framework :: Plone :: 6.1", "Framework :: Plone :: Addon", - "License :: OSI Approved :: GNU General Public License v2 (GPLv2)", "Operating System :: OS Independent", "Programming Language :: Python","Programming Language :: Python :: 3.10", "Programming Language :: Python","Programming Language :: Python :: 3.11", diff --git a/backend/version.txt b/backend/version.txt index f3b5af3..88d06f1 100644 --- a/backend/version.txt +++ b/backend/version.txt @@ -1 +1 @@ -6.1.1 +6.1.3 diff --git a/news/+gha.internal b/news/+gha.internal new file mode 100644 index 0000000..ee88004 --- /dev/null +++ b/news/+gha.internal @@ -0,0 +1 @@ +GHA: Small fixes to when workflows run. @ericof