diff --git a/.circleci/config.yml b/.circleci/config.yml index d199ae38be4..b2783e91fbf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -322,7 +322,9 @@ jobs: webhook_url_env_var: SLACK_DEV_INFRA_CI_FAILURES_WEBHOOK_URL test_aio: - executor: test-browser-executor + executor: + name: test-browser-executor + resource_class: 2xlarge+ steps: - custom_attach_workspace - init_environment @@ -353,7 +355,9 @@ jobs: - run: yarn --cwd aio deploy-production test_aio_local: - executor: test-browser-executor + executor: + name: test-browser-executor + resource_class: 2xlarge+ steps: - custom_attach_workspace - init_environment diff --git a/aio/package.json b/aio/package.json index c00a2ef9df5..ff0cab0be6e 100644 --- a/aio/package.json +++ b/aio/package.json @@ -45,7 +45,7 @@ "docs-test": "bazel test //aio/tools/transforms/...", "redirects-test": "node tests/deployment/unit/test", "firebase-utils-test": "node tools/firebase-test-utils/test", - "tools-lint": "eslint --ext=.mjs scripts/deploy-to-firebase && eslint tools/firebase-test-utils && eslint tools/ng-packages-installer", + "tools-lint": "eslint --ext=.mjs scripts/deploy-to-firebase && eslint tools/firebase-test-utils", "tools-test": "bazel test //aio/tools/... && jasmine scripts/deploy-to-firebase/**/*.spec.mjs && yarn firebase-utils-test", "serve": "bazel run //aio:serve", "serve-local": "yarn serve --config=aio_local_deps", diff --git a/aio/tools/examples/constants.js b/aio/tools/examples/constants.js index e9d623bd6ae..c24dc03f9a2 100644 --- a/aio/tools/examples/constants.js +++ b/aio/tools/examples/constants.js @@ -9,4 +9,4 @@ exports.SHARED_PATH = path.resolve(this.PROJECT_ROOT, 'aio', 'tools', 'examples' exports.EXAMPLE_CONFIG_FILENAME = 'example-config.json'; exports.STACKBLITZ_CONFIG_FILENAME = 'stackblitz.json'; -exports.BAZEL_EXAMPLE_BOILERPLATE_OUTPUT_PATH = process.env.BAZEL_EXAMPLE_BOILERPLATE_OUTPUT_PATH || 'bazel-test-dist'; +exports.BAZEL_EXAMPLE_BOILERPLATE_OUTPUT_PATH = process.env.BAZEL_EXAMPLE_BOILERPLATE_OUTPUT_PATH || process.env.TEST_TMPDIR; diff --git a/aio/tools/transforms/cli-docs-package/index.js b/aio/tools/transforms/cli-docs-package/index.js index 84d32087b83..aa64b89ce63 100644 --- a/aio/tools/transforms/cli-docs-package/index.js +++ b/aio/tools/transforms/cli-docs-package/index.js @@ -1,4 +1,4 @@ -const {runfiles} = require("@bazel/runfiles"); +const {runfiles} = require('@bazel/runfiles'); const {resolve} = require('canonical-path'); const { existsSync } = require('fs'); const semver = require('semver'); @@ -15,7 +15,7 @@ const CLI_SOURCE_HELP_PATH = resolve(CLI_SOURCE_PATH, 'help'); // target or a test target. function resolveCliSourcePath() { // Case: build, find in execroot - const path = resolve('external', 'angular_cli_src') + const path = resolve('external', 'angular_cli_src'); if (existsSync(path)) { return path; } diff --git a/aio/tools/transforms/config.js b/aio/tools/transforms/config.js index 488fb0261d8..e5c729ee72b 100644 --- a/aio/tools/transforms/config.js +++ b/aio/tools/transforms/config.js @@ -1,14 +1,13 @@ const { resolve } = require('path'); const { readdirSync } = require('fs'); -// If the output path isn't set, we are in a test so output to some -// directory that gets output to the sandbox and will be thrown away -// after the tests run. -const BAZEL_OUTPUT_PATH = process.env.BAZEL_DGENI_OUTPUT_PATH || "bazel-test-dist"; +// If the output path isn't set, we are in a test so output a temporary +// directory (TEST_TMPDIR) that bazel provides for tests. +const BAZEL_OUTPUT_PATH = process.env.BAZEL_DGENI_OUTPUT_PATH || process.env.TEST_TMPDIR; // During a bazel build this script executes in the execroot, so assume // the root is the current directory unless overridden. -const PROJECT_ROOT = resolve(process.env.PROJECT_ROOT || "."); +const PROJECT_ROOT = resolve(process.env.PROJECT_ROOT || '.'); const AIO_PATH = resolve(PROJECT_ROOT, 'aio'); const TEMPLATES_PATH = resolve(AIO_PATH, 'tools/transforms/templates');