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

Jump to bottom

Bump actions/upload-artifact to v4 #6253

Merged
merged 5 commits into from
Aug 14, 2024
Merged

Bump actions/upload-artifact to v4 #6253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee5dc78
Bump actions/upload-artifact to v4
stevepiercy Aug 13, 2024
72e0e12
news
stevepiercy Aug 13, 2024
032e42a
docker-compose -> docker compose
davisagli Aug 14, 2024
1170d3e
Update news/6253.internal
davisagli Aug 14, 2024
08cf00a
Copy another test fix from the other branches (no idea why this one b…
davisagli Aug 14, 2024
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
56 changes: 28 additions & 28 deletions .github/workflows/acceptance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
18 changes: 3 additions & 15 deletions cypress/tests/core/blocks/listing/blocks-listing-templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion g-api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions news/6253.internal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump actions/upload-artifact to v4 and replace `docker-compose` with `docker compose`. @stevepiercy, @davisagli
2 changes: 1 addition & 1 deletion packages/generator-volto/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading