diff --git a/.circleci/config.yml b/.circleci/config.yml index 341a8de9b5..17353495ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -168,6 +168,7 @@ jobs: NX_CLOUD_DISTRIBUTED_EXECUTION: 'true' SELECTED_CLI: << parameters.cli >> NX_E2E_CI_CACHE_KEY: e2e-circleci-<< parameters.os >>-<< parameters.pm >> + NX_E2E_RUN_CYPRESS: 'true' steps: - setup: os: << parameters.os >> @@ -213,11 +214,11 @@ workflows: name: 'agent5' - agent: name: 'agent6' - - trunk-main: - filters: - branches: - only: master - pr-main: filters: branches: ignore: master + - trunk-main: + filters: + branches: + only: master diff --git a/.github/workflows/e2e-matrix.yml b/.github/workflows/e2e-matrix.yml index 41a24ee2ef..7a9f93c9ca 100644 --- a/.github/workflows/e2e-matrix.yml +++ b/.github/workflows/e2e-matrix.yml @@ -100,7 +100,7 @@ jobs: GIT_COMMITTER_EMAIL: test@test.com GIT_COMMITTER_NAME: Test 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 SELECTED_PM: ${{ matrix.package_manager }} YARN_REGISTRY: http://localhost:4872 diff --git a/e2e/utils/index.ts b/e2e/utils/index.ts index 9244f9eba3..06e0f248f9 100644 --- a/e2e/utils/index.ts +++ b/e2e/utils/index.ts @@ -1,5 +1,4 @@ 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 { copySync, @@ -41,10 +40,6 @@ export function currentCli() { 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 e2eCwd = `${e2eRoot}/${currentCli()}`; ensureDirSync(e2eCwd); @@ -241,7 +236,7 @@ export async function removeProject({ onlyOnCI = false } = {}) { } export function runCypressTests() { - return isNightlyRun(); + return process.env.NX_E2E_RUN_CYPRESS === 'true'; } export function isNotWindows() {