diff --git a/.circleci/config.yml b/.circleci/config.yml index ef35fb031659..031a97b31df5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -324,6 +324,9 @@ jobs: workflows: version: 2 default_workflow: + when: + not: + equal: [scheduled_pipeline, << pipeline.trigger_source >>] jobs: # Linux jobs - setup @@ -392,16 +395,12 @@ workflows: - test - e2e-cli - nightly: - triggers: - - schedule: - cron: '0 0 * * *' - filters: - branches: - only: - - 13.3.x + daily_run_workflow: + when: + and: + - equal: [scheduled_pipeline, << pipeline.trigger_source >>] + - equal: ['13.3.x nightly run', << pipeline.schedule.name >>] jobs: - # Linux jobs - setup - build: requires: diff --git a/tests/legacy-cli/e2e/tests/commands/add/version-specifier.ts b/tests/legacy-cli/e2e/tests/commands/add/version-specifier.ts index 1078302590b8..c8316333ea8f 100644 --- a/tests/legacy-cli/e2e/tests/commands/add/version-specifier.ts +++ b/tests/legacy-cli/e2e/tests/commands/add/version-specifier.ts @@ -17,11 +17,6 @@ export default async function () { throw new Error('Installation was not skipped'); } - const output2 = await ng('add', '@angular/localize@latest', '--skip-confirmation'); - if (output2.stdout.includes('Skipping installation: Package already installed')) { - throw new Error('Installation should not have been skipped'); - } - // v12.2.0 has a package.json engine field that supports Node.js v16+ const output3 = await ng('add', '@angular/localize@12.2.0', '--skip-confirmation'); if (output3.stdout.includes('Skipping installation: Package already installed')) { diff --git a/tests/legacy-cli/e2e/tests/update/update-9.ts b/tests/legacy-cli/e2e/tests/update/update-9.ts index 69623ea76f49..00b9303f5c08 100644 --- a/tests/legacy-cli/e2e/tests/update/update-9.ts +++ b/tests/legacy-cli/e2e/tests/update/update-9.ts @@ -13,6 +13,8 @@ export default async function () { await setRegistry(false); await installWorkspacePackages(); + process.env['NG_DISABLE_VERSION_CHECK'] = '1'; + // Update Angular to 10 await installPackage('@angular/cli@9'); const { stdout } = await ng('update', '@angular/cli@10.x', '@angular/core@10.x'); @@ -23,6 +25,8 @@ export default async function () { // Update Angular to 11 await ng('update', '@angular/cli@11', '@angular/core@11'); + delete process.env['NG_DISABLE_VERSION_CHECK']; + // Update Angular to 12 await ng('update', '@angular/cli@12', '@angular/core@12'); } finally {