Skip to content

Commit

Permalink
Merge branch 'master' into search-reset-clear
Browse files Browse the repository at this point in the history
  • Loading branch information
ionlizarazu authored Jul 17, 2023
2 parents 64a9092 + be5ca36 commit c95eeeb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/buildout.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions news/4979.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update to latest plone.restapi and Plone 6.0.6 @sneridagh

0 comments on commit c95eeeb

Please sign in to comment.