Merge branch 'main' into cpaliases-refactor

plone · Aug 8, 2024 · df99aa9 · df99aa9
2 parents b96e3a1 + eb611a8
commit df99aa9
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 56 deletions.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -37,13 +37,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos
@@ -85,13 +85,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos
@@ -133,13 +133,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos
@@ -181,13 +181,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos
@@ -229,13 +229,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos
@@ -277,13 +277,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos
@@ -324,13 +324,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos
@@ -372,13 +372,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos
@@ -420,13 +420,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos
@@ -469,13 +469,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos
@@ -571,14 +571,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: packages/volto/cypress/screenshots
 
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos
@@ -627,13 +627,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos-seamless
@@ -677,13 +677,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: packages/volto/cypress/screenshots
  # Upload Cypress videos
- - uses: actions/upload-artifact@v1
+ - uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: cypress-videos

diff --git a/apps/plone/package.json b/apps/plone/package.json
@@ -288,7 +288,7 @@
  "bundlewatch": "0.3.3",
  "circular-dependency-plugin": "5.2.2",
  "css-loader": "5.2.7",
- "cypress": "13.6.6",
+ "cypress": "13.13.2",
  "cypress-axe": "1.5.0",
  "cypress-file-upload": "5.0.8",
  "deep-freeze": "0.0.1",

diff --git a/packages/volto-testing/package.json b/packages/volto-testing/package.json
@@ -41,7 +41,7 @@
  "@testing-library/jest-dom": "6.4.2",
  "@testing-library/react": "12.1.5",
  "axe-core": "4.8.4",
- "cypress": "13.6.6",
+ "cypress": "13.13.2",
  "cypress-axe": "1.5.0",
  "cypress-file-upload": "5.0.8"
  },

diff --git a/packages/volto/news/6241.internal b/packages/volto/news/6241.internal
@@ -0,0 +1 @@
+Upgrade Cypress to 13.13.2. @wesleybl
diff --git a/packages/volto/news/6242.internal b/packages/volto/news/6242.internal
@@ -0,0 +1 @@
+Complete upgrade Cypress to 13.13.2. Bump actions/upload-artifact@v1 to v4. @stevepiercy
diff --git a/packages/volto/package.json b/packages/volto/package.json
@@ -325,7 +325,7 @@
  "bundlewatch": "0.3.3",
  "circular-dependency-plugin": "5.2.2",
  "css-loader": "5.2.7",
- "cypress": "13.6.6",
+ "cypress": "13.13.2",
  "cypress-axe": "1.5.0",
  "cypress-file-upload": "5.0.8",
  "deep-freeze": "0.0.1",