Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/pullRequests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ jobs:
- name: Install dependencies
run: yarn --immutable
working-directory: ${{ github.base_ref }}
- name: Check types for Cypress tests
run: yarn cy:ts
- name: Check types for E2E tests
run: yarn e2e:ts
working-directory: ${{ github.base_ref }}
env:
NODE_OPTIONS: '--max_old_space_size=4096'
Expand Down
88 changes: 35 additions & 53 deletions .github/workflows/pullRequestsCommandE2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
with:
issue-number: ${{ github.event.issue.number }}
body: >-
Cypress E2E tests have been initiated (for more information, click
E2E tests have been initiated (for more information, click
[here](https://github.com/webiny/webiny-js/actions/runs/${{
github.run_id }})). :sparkles:

Expand Down Expand Up @@ -148,7 +148,6 @@ jobs:
- build
name: Constants - DDB
outputs:
cypress-folders: ${{ steps.list-cypress-folders.outputs.cypress-folders }}
pulumi-backend-url: ${{ steps.pulumi-backend-url.outputs.pulumi-backend-url }}
steps:
- uses: actions/setup-node@v5
Expand All @@ -162,12 +161,6 @@ jobs:
run: gh pr checkout ${{ github.event.issue.number }}
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
- name: List Cypress tests folders
id: list-cypress-folders
run: >-
echo "cypress-folders=$(node scripts/listCypressTestsFolders.js)" >>
$GITHUB_OUTPUT
working-directory: ${{ needs.baseBranch.outputs.base-branch }}
- name: Get Pulumi backend URL
id: get-pulumi-backend-url
run: >-
Expand All @@ -184,13 +177,10 @@ jobs:
- e2e-wby-cms-ddb-constants
- checkComment
name: E2E (DDB) - Project setup
outputs:
cypress-config: ${{ steps.save-cypress-config.outputs.cypress-config }}
environment: next
env:
NODE_OPTIONS: '--max_old_space_size=4096'
YARN_ENABLE_IMMUTABLE_INSTALLS: false
CYPRESS_MAILOSAUR_API_KEY: ${{ secrets.CYPRESS_MAILOSAUR_API_KEY }}
PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
PULUMI_SECRETS_PROVIDER: ${{ secrets.PULUMI_SECRETS_PROVIDER }}
WEBINY_PULUMI_BACKEND: ${{ needs.e2e-wby-cms-ddb-constants.outputs.pulumi-backend-url }}
Expand Down Expand Up @@ -313,23 +303,24 @@ jobs:

gh api repos/${{ github.repository }}/issues/comments/$COMMENT_ID -X
PATCH --field body=@/tmp/comment.txt
- name: Create Cypress config
run: yarn setup-cypress --projectFolder ../new-webiny-project
working-directory: ${{ needs.baseBranch.outputs.base-branch }}
- name: Save Cypress config
id: save-cypress-config
run: >-
echo "cypress-config=$(cat cypress-tests/cypress.config.ts | tr -d
'\t\n\r')" >> $GITHUB_OUTPUT
working-directory: ${{ needs.baseBranch.outputs.base-branch }}
- name: Install Cypress binary
run: cd cypress-tests && yarn cypress install
working-directory: ${{ needs.baseBranch.outputs.base-branch }}
- name: Cypress - run installation wizard test
run: >-
yarn cy:run --browser chrome --spec
"cypress/e2e/adminInstallation/**/*.cy.js"
- name: E2E - run installation wizard test
working-directory: ${{ needs.baseBranch.outputs.base-branch }}
env:
E2E_ADMIN_URL: ${{ steps.admin-url.outputs.admin-url }}
E2E_INSTALLATION: '1'
E2E_TELEMETRY_DISABLED: '1'
run: |-
yarn workspace e2e-tests playwright install --with-deps chromium
yarn e2e --tag installation
- name: E2E - upload installation test results
if: failure()
uses: actions/upload-artifact@v6
with:
name: e2e-results-ddb
retention-days: 7
if-no-files-found: ignore
include-hidden-files: true
path: ${{ needs.baseBranch.outputs.base-branch }}/e2e/.e2e
runs-on: ubuntu-latest
permissions:
id-token: write
Expand All @@ -340,7 +331,6 @@ jobs:
- build
name: Constants - DDB-OS
outputs:
cypress-folders: ${{ steps.list-cypress-folders.outputs.cypress-folders }}
pulumi-backend-url: ${{ steps.pulumi-backend-url.outputs.pulumi-backend-url }}
steps:
- uses: actions/setup-node@v5
Expand All @@ -354,12 +344,6 @@ jobs:
run: gh pr checkout ${{ github.event.issue.number }}
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
- name: List Cypress tests folders
id: list-cypress-folders
run: >-
echo "cypress-folders=$(node scripts/listCypressTestsFolders.js)" >>
$GITHUB_OUTPUT
working-directory: ${{ needs.baseBranch.outputs.base-branch }}
- name: Get Pulumi backend URL
id: get-pulumi-backend-url
run: >-
Expand All @@ -376,13 +360,10 @@ jobs:
- e2e-wby-cms-ddb-os-constants
- checkComment
name: E2E (DDB-OS) - Project setup
outputs:
cypress-config: ${{ steps.save-cypress-config.outputs.cypress-config }}
environment: next
env:
NODE_OPTIONS: '--max_old_space_size=4096'
YARN_ENABLE_IMMUTABLE_INSTALLS: false
CYPRESS_MAILOSAUR_API_KEY: ${{ secrets.CYPRESS_MAILOSAUR_API_KEY }}
PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
PULUMI_SECRETS_PROVIDER: ${{ secrets.PULUMI_SECRETS_PROVIDER }}
WEBINY_PULUMI_BACKEND: ${{ needs.e2e-wby-cms-ddb-os-constants.outputs.pulumi-backend-url }}
Expand Down Expand Up @@ -526,23 +507,24 @@ jobs:

gh api repos/${{ github.repository }}/issues/comments/$COMMENT_ID -X
PATCH --field body=@/tmp/comment.txt
- name: Create Cypress config
run: yarn setup-cypress --projectFolder ../new-webiny-project
working-directory: ${{ needs.baseBranch.outputs.base-branch }}
- name: Save Cypress config
id: save-cypress-config
run: >-
echo "cypress-config=$(cat cypress-tests/cypress.config.ts | tr -d
'\t\n\r')" >> $GITHUB_OUTPUT
working-directory: ${{ needs.baseBranch.outputs.base-branch }}
- name: Install Cypress binary
run: cd cypress-tests && yarn cypress install
working-directory: ${{ needs.baseBranch.outputs.base-branch }}
- name: Cypress - run installation wizard test
run: >-
yarn cy:run --browser chrome --spec
"cypress/e2e/adminInstallation/**/*.cy.js"
- name: E2E - run installation wizard test
working-directory: ${{ needs.baseBranch.outputs.base-branch }}
env:
E2E_ADMIN_URL: ${{ steps.admin-url.outputs.admin-url }}
E2E_INSTALLATION: '1'
E2E_TELEMETRY_DISABLED: '1'
run: |-
yarn workspace e2e-tests playwright install --with-deps chromium
yarn e2e --tag installation
- name: E2E - upload installation test results
if: failure()
uses: actions/upload-artifact@v6
with:
name: e2e-results-ddb-os
retention-days: 7
if-no-files-found: ignore
include-hidden-files: true
path: ${{ needs.baseBranch.outputs.base-branch }}/e2e/.e2e
runs-on: ubuntu-latest
permissions:
id-token: write
96 changes: 46 additions & 50 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ jobs:
- name: Install dependencies
run: yarn --immutable
working-directory: v6
- name: Check types for Cypress tests
run: yarn cy:ts
- name: Check types for E2E tests
run: yarn e2e:ts
working-directory: v6
env:
NODE_OPTIONS: '--max_old_space_size=4096'
Expand Down Expand Up @@ -494,18 +494,12 @@ jobs:
needs:
- build
outputs:
cypress-folders: ${{ steps.list-cypress-folders.outputs.cypress-folders }}
pulumi-backend-url: ${{ steps.pulumi-backend-url.outputs.pulumi-backend-url }}
steps:
- uses: actions/setup-node@v5
with:
node-version: 24
- uses: actions/checkout@v5
- name: List Cypress tests folders
id: list-cypress-folders
run: >-
echo "cypress-folders=$(node scripts/listCypressTestsFolders.js)" >>
$GITHUB_OUTPUT
- name: Get Pulumi backend URL
id: get-pulumi-backend-url
run: >-
Expand All @@ -522,13 +516,10 @@ jobs:
- e2eTests-ddb-constants
runs-on: webiny-build-packages
name: E2E (DDB) - Project setup
outputs:
cypress-config: ${{ steps.save-cypress-config.outputs.cypress-config }}
environment: next
env:
NODE_OPTIONS: '--max_old_space_size=4096'
YARN_ENABLE_IMMUTABLE_INSTALLS: 'false'
CYPRESS_MAILOSAUR_API_KEY: ${{ secrets.CYPRESS_MAILOSAUR_API_KEY }}
PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
PULUMI_SECRETS_PROVIDER: ${{ secrets.PULUMI_SECRETS_PROVIDER }}
WEBINY_PULUMI_BACKEND: ${{ needs.e2eTests-ddb-constants.outputs.pulumi-backend-url }}
Expand Down Expand Up @@ -626,42 +617,43 @@ jobs:
- name: Deploy Admin Area
working-directory: new-webiny-project
run: yarn webiny deploy admin --env dev
- name: Create Cypress config
run: yarn setup-cypress --projectFolder ../new-webiny-project
working-directory: v6
- name: Save Cypress config
id: save-cypress-config
run: >-
echo "cypress-config=$(cat cypress-tests/cypress.config.ts | tr -d
'\t\n\r')" >> $GITHUB_OUTPUT
working-directory: v6
- name: Install Cypress binary
run: cd cypress-tests && yarn cypress install
working-directory: v6
- name: Cypress - run installation wizard test
- name: Extract admin app URL
id: admin-url
working-directory: new-webiny-project
run: >-
yarn cy:run --browser chrome --spec
"cypress/e2e/adminInstallation/**/*.cy.js"
echo "admin-url=$(yarn webiny output admin --env dev --json
2>/dev/null | jq -r '.appUrl // empty')" >> $GITHUB_OUTPUT
- name: E2E - run installation wizard test
working-directory: v6
env:
E2E_ADMIN_URL: ${{ steps.admin-url.outputs.admin-url }}
E2E_INSTALLATION: '1'
E2E_TELEMETRY_DISABLED: '1'
run: |-
yarn workspace e2e-tests playwright install --with-deps chromium
yarn e2e --tag installation
- name: E2E - upload installation test results
if: failure()
uses: actions/upload-artifact@v6
with:
name: e2e-results-ddb
retention-days: 7
if-no-files-found: ignore
include-hidden-files: true
path: v6/e2e/.e2e
permissions:
id-token: write
e2eTests-ddb-os-constants:
name: E2E (DDB+OS) - Constants
needs:
- build
outputs:
cypress-folders: ${{ steps.list-cypress-folders.outputs.cypress-folders }}
pulumi-backend-url: ${{ steps.pulumi-backend-url.outputs.pulumi-backend-url }}
steps:
- uses: actions/setup-node@v5
with:
node-version: 24
- uses: actions/checkout@v5
- name: List Cypress tests folders
id: list-cypress-folders
run: >-
echo "cypress-folders=$(node scripts/listCypressTestsFolders.js)" >>
$GITHUB_OUTPUT
- name: Get Pulumi backend URL
id: get-pulumi-backend-url
run: >-
Expand All @@ -678,13 +670,10 @@ jobs:
- e2eTests-ddb-os-constants
runs-on: webiny-build-packages
name: E2E (DDB+OS) - Project setup
outputs:
cypress-config: ${{ steps.save-cypress-config.outputs.cypress-config }}
environment: next
env:
NODE_OPTIONS: '--max_old_space_size=4096'
YARN_ENABLE_IMMUTABLE_INSTALLS: 'false'
CYPRESS_MAILOSAUR_API_KEY: ${{ secrets.CYPRESS_MAILOSAUR_API_KEY }}
PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
PULUMI_SECRETS_PROVIDER: ${{ secrets.PULUMI_SECRETS_PROVIDER }}
WEBINY_PULUMI_BACKEND: ${{ needs.e2eTests-ddb-os-constants.outputs.pulumi-backend-url }}
Expand Down Expand Up @@ -803,22 +792,29 @@ jobs:
&& echo "$OUTPUT" | jq -e '.databaseSetup == "ddb+os"' || (echo
"ERROR: Expected databaseSetup to be 'ddb+os' but got a different
value" && exit 1)
- name: Create Cypress config
run: yarn setup-cypress --projectFolder ../new-webiny-project
working-directory: v6
- name: Save Cypress config
id: save-cypress-config
run: >-
echo "cypress-config=$(cat cypress-tests/cypress.config.ts | tr -d
'\t\n\r')" >> $GITHUB_OUTPUT
working-directory: v6
- name: Install Cypress binary
run: cd cypress-tests && yarn cypress install
working-directory: v6
- name: Cypress - run installation wizard test
- name: Extract admin app URL
id: admin-url
working-directory: new-webiny-project
run: >-
yarn cy:run --browser chrome --spec
"cypress/e2e/adminInstallation/**/*.cy.js"
echo "admin-url=$(yarn webiny output admin --env dev --json
2>/dev/null | jq -r '.appUrl // empty')" >> $GITHUB_OUTPUT
- name: E2E - run installation wizard test
working-directory: v6
env:
E2E_ADMIN_URL: ${{ steps.admin-url.outputs.admin-url }}
E2E_INSTALLATION: '1'
E2E_TELEMETRY_DISABLED: '1'
run: |-
yarn workspace e2e-tests playwright install --with-deps chromium
yarn e2e --tag installation
- name: E2E - upload installation test results
if: failure()
uses: actions/upload-artifact@v6
with:
name: e2e-results-ddb-os
retention-days: 7
if-no-files-found: ignore
include-hidden-files: true
path: v6/e2e/.e2e
permissions:
id-token: write
Loading
Loading