diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 440ac41aab..560a050feb 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -41,13 +41,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -93,13 +93,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -145,13 +145,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -197,13 +197,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -249,13 +249,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -301,13 +301,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -352,13 +352,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -403,13 +403,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -456,13 +456,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:8081 http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -508,13 +508,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -585,13 +585,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -686,14 +686,14 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -746,13 +746,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000 http://localhost' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos @@ -800,13 +800,13 @@ jobs: wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000 http://localhost' # Upload Cypress screenshots - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress/screenshots # Upload Cypress videos - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos diff --git a/Makefile b/Makefile index 67da9f5a35..8e974dc36e 100644 --- a/Makefile +++ b/Makefile @@ -192,7 +192,7 @@ start-frontend-docker: .PHONY: start-backend-docker-guillotina start-backend-docker-guillotina: - docker-compose -f g-api/docker-compose.yml up -d + docker compose -f g-api/docker-compose.yml up -d ##### Acceptance tests (Cypress) @@ -217,7 +217,7 @@ start-test-backend: ## Start Test Plone Backend (api folder) .PHONY: stop-backend-docker-guillotina stop-backend-docker-guillotina: - docker-compose -f g-api/docker-compose.yml down + docker compose -f g-api/docker-compose.yml down .PHONY: test-acceptance-server-old @@ -264,7 +264,7 @@ test-acceptance-seamless: ## Start Seamless Cypress Acceptance Tests .PHONY: start-test-acceptance-webserver-seamless start-test-acceptance-webserver-seamless: ## Start the seamless webserver - cd cypress/docker && docker-compose -f seamless.yml up + cd cypress/docker && docker compose -f seamless.yml up .PHONY: full-test-acceptance-seamless full-test-acceptance-seamless: ## Runs Seamless Core Full Acceptance Testing in headless mode @@ -374,7 +374,7 @@ full-test-acceptance-workingcopy: ## Runs WorkingCopy Full Acceptance Testing in .PHONY: start-test-acceptance-server-guillotina start-test-acceptance-server-guillotina: ## Start Guillotina Test Acceptance Server (docker container) - docker-compose -f g-api/docker-compose.yml up > /dev/null + docker compose -f g-api/docker-compose.yml up > /dev/null .PHONY: start-test-acceptance-frontend-guillotina start-test-acceptance-frontend-guillotina: ## Start the Guillotina Acceptance Frontend Fixture diff --git a/cypress/tests/core/blocks/listing/blocks-listing-templates.js b/cypress/tests/core/blocks/listing/blocks-listing-templates.js index 37af70bdcf..5de2f56cb5 100644 --- a/cypress/tests/core/blocks/listing/blocks-listing-templates.js +++ b/cypress/tests/core/blocks/listing/blocks-listing-templates.js @@ -34,11 +34,7 @@ describe('Folder Contents Tests', () => { cy.visit('/my-folder/my-document'); cy.get('.edit').click(); - cy.getSlate().click(); - cy.get('button.block-add-button').click(); - cy.get( - '[style="transition: opacity 500ms ease 0ms;"] > :nth-child(2) > .ui', - ).click(); + cy.addNewBlock('listing'); cy.get('#field-variation').click().type('summary{enter}'); cy.get('#toolbar-save').click(); cy.wait('@content'); @@ -74,11 +70,7 @@ describe('Folder Contents Tests', () => { cy.visit('/my-folder/my-document'); cy.get('.edit').click(); - cy.getSlate().click(); - cy.get('button.block-add-button').click(); - cy.get( - '[style="transition: opacity 500ms ease 0ms;"] > :nth-child(2) > .ui', - ).click(); + cy.addNewBlock('listing'); cy.get('#field-variation').click().type('summary{enter}'); cy.get('#toolbar-save').click(); cy.wait('@content'); @@ -116,11 +108,7 @@ describe('Folder Contents Tests', () => { cy.visit('/my-folder/my-document'); cy.get('.edit').click(); - cy.getSlate().click(); - cy.get('button.block-add-button').click(); - cy.get( - '[style="transition: opacity 500ms ease 0ms;"] > :nth-child(2) > .ui', - ).click(); + cy.addNewBlock('listing'); cy.get('#field-variation').click().type('imageGallery{enter}'); cy.get('#toolbar-save').click(); cy.wait('@content'); diff --git a/g-api/README.md b/g-api/README.md index c86a915e31..601355925c 100644 --- a/g-api/README.md +++ b/g-api/README.md @@ -7,7 +7,7 @@ Configuration demonstrating how to run Volto with Guillotina as a backend. _Disclaimer:_ Guillotina doesn't support the full API/features that Plone provides. Contributors are welcome. ```shell -docker-compose -f g-api/docker-compose.yml up -d +docker compose -f g-api/docker-compose.yml up -d ``` or using the convenience makefile command: diff --git a/news/6253.internal b/news/6253.internal new file mode 100644 index 0000000000..6e9a9f948e --- /dev/null +++ b/news/6253.internal @@ -0,0 +1 @@ +Bump actions/upload-artifact to v4 and replace `docker-compose` with `docker compose`. @stevepiercy, @davisagli diff --git a/packages/generator-volto/Makefile b/packages/generator-volto/Makefile index 61f23050cc..4d6d0328cf 100644 --- a/packages/generator-volto/Makefile +++ b/packages/generator-volto/Makefile @@ -29,4 +29,4 @@ test-acceptance-server: .PHONY: test-acceptance-guillotina test-acceptance-guillotina: - docker-compose -f g-api/docker-compose.yml up > /dev/null + docker compose -f g-api/docker-compose.yml up > /dev/null