From 2f56f85302746d3f2d6df95d48a98a698f6d9626 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Mon, 17 Jul 2023 15:20:18 +0200 Subject: [PATCH 1/2] Update to latest p.restapi and Plone 6.0.6 --- Makefile | 12 ++++++------ api/buildout.cfg | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a094073869..ca85430928 100644 --- a/Makefile +++ b/Makefile @@ -13,15 +13,15 @@ MAKEFLAGS+=--no-builtin-rules # Project settings INSTANCE_PORT=8080 -DOCKER_IMAGE=plone/server-dev:6.0.5 -DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.5 -KGS= +DOCKER_IMAGE=plone/server-dev:6.0.6 +DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.6 +KGS=plone.restapi==8.42.0 NODEBIN = ./node_modules/.bin SCRIPTSPACKAGE = ./packages/scripts # Plone 5 legacy -DOCKER_IMAGE5=plone/plone-backend:5.2.10 -KGS5=plone.restapi==8.37.0 plone.volto==4.0.8 plone.rest==3.0.0 +DOCKER_IMAGE5=plone/plone-backend:5.2.12 +KGS5=plone.restapi==8.42.0 plone.volto==4.0.8 plone.rest==3.0.0 TESTING_ADDONS=plone.app.robotframework==2.0.0 plone.app.testing==7.0.0 # Sphinx variables @@ -240,7 +240,7 @@ test-acceptance: ## Start Core Cypress Acceptance Tests .PHONY: test-acceptance-headless test-acceptance-headless: ## Start Core Cypress Acceptance Tests in headless mode - NODE_ENV=production CYPRESS_API=plone $(NODEBIN)/cypress run + NODE_ENV=production CYPRESS_API=plone $(NODEBIN)/cypress run --config specPattern='cypress/tests/core/**/*.{js,jsx,ts,tsx}' .PHONY: full-test-acceptance full-test-acceptance: ## Runs Core Full Acceptance Testing in headless mode diff --git a/api/buildout.cfg b/api/buildout.cfg index f3d12ae947..e11b411802 100644 --- a/api/buildout.cfg +++ b/api/buildout.cfg @@ -1,7 +1,7 @@ [buildout] index = https://pypi.org/simple/ extends = - http://dist.plone.org/release/6.0.5/versions.cfg + http://dist.plone.org/release/6.0.6/versions.cfg version-constraints.cfg versions.cfg parts = instance plonesite site-packages test robot-server From 398f1e2c64d0d0fc3789256bda0ae339776dddad Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Mon, 17 Jul 2023 15:20:58 +0200 Subject: [PATCH 2/2] Changelog --- news/4979.internal | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/4979.internal diff --git a/news/4979.internal b/news/4979.internal new file mode 100644 index 0000000000..a0c7c8294d --- /dev/null +++ b/news/4979.internal @@ -0,0 +1 @@ +Update to latest plone.restapi and Plone 6.0.6 @sneridagh