miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

chore(repo): run cypress tests on merge to master (#6262)

Browse Source
This commit is contained in:
Miroslav Jonaš 2021-07-06 11:25:42 +02:00 committed by GitHub
parent 9af4004922
commit e19fd897eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.circleci/config.yml
View File

@ -168,6 +168,7 @@ jobs:
NX_CLOUD_DISTRIBUTED_EXECUTION: 'true' NX_CLOUD_DISTRIBUTED_EXECUTION: 'true'
SELECTED_CLI: << parameters.cli >> SELECTED_CLI: << parameters.cli >>
NX_E2E_CI_CACHE_KEY: e2e-circleci-<< parameters.os >>-<< parameters.pm >> NX_E2E_CI_CACHE_KEY: e2e-circleci-<< parameters.os >>-<< parameters.pm >>
NX_E2E_RUN_CYPRESS: 'true'
steps: steps:
- setup: - setup:
os: << parameters.os >> os: << parameters.os >>
@ -213,11 +214,11 @@ workflows:
name: 'agent5' name: 'agent5'
- agent: - agent:
name: 'agent6' name: 'agent6'
- trunk-main:
filters:
branches:
only: master
- pr-main: - pr-main:
filters: filters:
branches: branches:
ignore: master ignore: master
- trunk-main:
filters:
branches:
only: master

2
.github/workflows/e2e-matrix.yml vendored
View File

@ -100,7 +100,7 @@ jobs:
GIT_COMMITTER_EMAIL: test@test.com GIT_COMMITTER_EMAIL: test@test.com
GIT_COMMITTER_NAME: Test GIT_COMMITTER_NAME: Test
NX_E2E_CI_CACHE_KEY: e2e-gha-${{ matrix.os }}-${{ matrix.node_version }}-${{ matrix.package_manager }} NX_E2E_CI_CACHE_KEY: e2e-gha-${{ matrix.os }}-${{ matrix.node_version }}-${{ matrix.package_manager }}
NX_E2E_CI_NIGHTLY: ${{ 'true' }} NX_E2E_RUN_CYPRESS: ${{ 'true' }}
NODE_OPTIONS: --max_old_space_size=8192 NODE_OPTIONS: --max_old_space_size=8192
SELECTED_PM: ${{ matrix.package_manager }} SELECTED_PM: ${{ matrix.package_manager }}
YARN_REGISTRY: http://localhost:4872 YARN_REGISTRY: http://localhost:4872

7
e2e/utils/index.ts
View File

@ -1,5 +1,4 @@
import { detectPackageManager } from '@nrwl/tao/src/shared/package-manager'; import { detectPackageManager } from '@nrwl/tao/src/shared/package-manager';
import { inlineProjectConfigurations } from '@nrwl/tao/src/shared/workspace';
import { ChildProcess, exec, execSync } from 'child_process'; import { ChildProcess, exec, execSync } from 'child_process';
import { import {
copySync, copySync,
@ -41,10 +40,6 @@ export function currentCli() {
return process.env.SELECTED_CLI || 'nx'; return process.env.SELECTED_CLI || 'nx';
} }
export function isNightlyRun() {
return process.env.NX_E2E_CI_NIGHTLY === 'true';
}
export const e2eRoot = isCI ? dirSync({ prefix: 'nx-e2e-' }).name : `./tmp`; export const e2eRoot = isCI ? dirSync({ prefix: 'nx-e2e-' }).name : `./tmp`;
export const e2eCwd = `${e2eRoot}/${currentCli()}`; export const e2eCwd = `${e2eRoot}/${currentCli()}`;
ensureDirSync(e2eCwd); ensureDirSync(e2eCwd);
@ -241,7 +236,7 @@ export async function removeProject({ onlyOnCI = false } = {}) {
} }
export function runCypressTests() { export function runCypressTests() {
return isNightlyRun(); return process.env.NX_E2E_RUN_CYPRESS === 'true';
} }
export function isNotWindows() { export function isNotWindows() {