Skip to content

Commit

Permalink
Merge branch 'master' into draft_save
Browse files Browse the repository at this point in the history
  • Loading branch information
sneridagh authored Sep 14, 2023
2 parents 1dea385 + 535c6ae commit 2eca0bc
Show file tree
Hide file tree
Showing 258 changed files with 7,229 additions and 2,232 deletions.
70 changes: 15 additions & 55 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]
steps:
- uses: actions/checkout@v3

Expand All @@ -24,20 +24,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: false # Since they run on different node versions, we can't parallel
browser: chrome
group: Core ${{ matrix.node-version }}
spec: cypress/tests/core/basic/**/*.js
start: |
make start-test-acceptance-server
Expand Down Expand Up @@ -65,7 +61,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]
steps:
- uses: actions/checkout@v3

Expand All @@ -80,20 +76,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: false # Since they run on different node versions, we can't parallel
browser: chrome
group: Core Blocks ${{ matrix.node-version }}
spec: cypress/tests/core/blocks/**/*.js
start: |
make start-test-acceptance-server
Expand Down Expand Up @@ -121,7 +113,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]
steps:
- uses: actions/checkout@v3

Expand All @@ -136,20 +128,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: false # Since they run on different node versions, we can't parallel
browser: chrome
group: Core Volto Slate ${{ matrix.node-version }}
spec: cypress/tests/core/volto-slate/**/*.js
start: |
make start-test-acceptance-server
Expand Down Expand Up @@ -191,20 +179,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: false # Since they run on different node versions, we can't parallel
browser: chrome
group: Core Basic - Plone 5
spec: cypress/tests/core/basic/**/*.js
start: |
make start-test-acceptance-server-5
Expand Down Expand Up @@ -246,20 +230,16 @@ jobs:
- run: yarn --immutable

- name: Cypress Coresandbox Acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Coresandbox
spec: cypress/tests/coresandbox/**/*.js
start: |
make start-test-acceptance-server-coresandbox
Expand Down Expand Up @@ -302,21 +282,17 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_API: guillotina
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Guillotina
spec: cypress/tests/guillotina/**/*.js
start: |
make start-test-acceptance-server-guillotina
Expand Down Expand Up @@ -359,20 +335,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Multilingual
spec: cypress/tests/multilingual/**/*.js
start: |
make start-test-acceptance-server-multilingual
Expand Down Expand Up @@ -440,20 +412,16 @@ jobs:
# CI: true

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Working Copy
spec: cypress/tests/workingCopy/**/*.js
start: |
make start-test-acceptance-server-workingcopy
Expand All @@ -468,7 +436,7 @@ jobs:
path: cypress/screenshots
# Upload Cypress videos
- uses: actions/upload-artifact@v1
if: always()
if: failure()
with:
name: cypress-videos
path: cypress/videos
Expand All @@ -481,7 +449,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18.x]
node-version: [18.x, 20.x]
env:
generator-directory: ./packages/generator-volto
project-directory: ./my-volto-app
Expand Down Expand Up @@ -531,20 +499,16 @@ jobs:
working-directory: ${{env.project-directory}}

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Project Generator
spec: cypress/tests/minimal/**/*.js
start: |
make start-test-acceptance-server
Expand Down Expand Up @@ -593,20 +557,16 @@ jobs:
- run: yarn --immutable

- name: Cypress acceptance tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
record: true
parallel: true
browser: chrome
group: Seamless
spec: cypress/tests/core/basic/**/*.js
config: baseUrl=http://localhost
start: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
pull_request:
paths:
- 'docs/**'
- 'styles/**'

jobs:
docs:
Expand Down Expand Up @@ -46,4 +47,3 @@ jobs:
# Required, set by GitHub actions automatically:
# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

2 changes: 1 addition & 1 deletion .github/workflows/towncrier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master

env:
node-version: 16.x
node-version: 18.x

jobs:
towncrier:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]
steps:
- uses: actions/checkout@v3

# node setup
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
# remove workaround for 18.x once https://github.com/nodejs/node/issues/47563 is fixed
# remove workaround for 18.x once https://github.com/nodejs/node/issues/47563 is fixed
node-version: ${{ matrix.node-version == '18.x' && '18.15.0' || matrix.node-version }}
cache: yarn

Expand Down
Loading

0 comments on commit 2eca0bc

Please sign in to comment.