From e16d234709eedd808ca9a11a7943a464905fe94d Mon Sep 17 00:00:00 2001 From: Pete Bacon Darwin Date: Sat, 10 Apr 2021 17:30:33 +0100 Subject: [PATCH] ci: enable compliance tests on Windows (#41556) Now that we have updated the Bazel node.js rules we can run all the compliance tests in Windows on CI. PR Close #41556 --- .circleci/config.yml | 34 +++++++++---------- .../partial/partial_compliance_goldens.bzl | 6 ---- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0afba28cf7..0cfaf72289 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,8 +145,8 @@ commands: - run: name: Set up environment environment: - CIRCLE_GIT_BASE_REVISION: << pipeline.git.base_revision >> - CIRCLE_GIT_REVISION: << pipeline.git.revision >> + CIRCLE_GIT_BASE_REVISION: << pipeline.git.base_revision >> + CIRCLE_GIT_REVISION: << pipeline.git.revision >> command: ./.circleci/env.sh - run: # Configure git as the CircleCI `checkout` command does. @@ -463,7 +463,7 @@ jobs: aio_preview: executor: default-executor environment: - AIO_SNAPSHOT_ARTIFACT_PATH: &aio_preview_artifact_path 'aio/tmp/snapshot.tgz' + AIO_SNAPSHOT_ARTIFACT_PATH: &aio_preview_artifact_path "aio/tmp/snapshot.tgz" steps: - custom_attach_workspace - init_environment @@ -487,7 +487,6 @@ jobs: name: Wait for preview and run tests command: node aio/scripts/test-preview.js $CI_PULL_REQUEST $CI_COMMIT $CI_AIO_MIN_PWA_SCORE - # The `build-npm-packages` tasks exist for backwards-compatibility with old scripts and # tests that rely on the pre-Bazel `dist/packages-dist` output structure (build.sh). # Having multiple jobs that independently build in this manner duplicates some work; we build @@ -547,12 +546,12 @@ jobs: publish_packages_as_artifacts: executor: default-executor environment: - AIMWA_PACKAGES_DIR: &aimwa_packages_dir 'dist/angular-in-memory-web-api-dist' - AIMWA_PACKAGES_ARCHIVES_DIR: &aimwa_packages_archives_dir 'dist/angular-in-memory-web-api-dist-archives' - NG_PACKAGES_DIR: &ng_packages_dir 'dist/packages-dist' - NG_PACKAGES_ARCHIVES_DIR: &ng_packages_archives_dir 'dist/packages-dist-archives' - ZONEJS_PACKAGES_DIR: &zonejs_packages_dir 'dist/zone.js-dist' - ZONEJS_PACKAGES_ARCHIVES_DIR: &zonejs_packages_archives_dir 'dist/zone.js-dist-archives' + AIMWA_PACKAGES_DIR: &aimwa_packages_dir "dist/angular-in-memory-web-api-dist" + AIMWA_PACKAGES_ARCHIVES_DIR: &aimwa_packages_archives_dir "dist/angular-in-memory-web-api-dist-archives" + NG_PACKAGES_DIR: &ng_packages_dir "dist/packages-dist" + NG_PACKAGES_ARCHIVES_DIR: &ng_packages_archives_dir "dist/packages-dist-archives" + ZONEJS_PACKAGES_DIR: &zonejs_packages_dir "dist/zone.js-dist" + ZONEJS_PACKAGES_ARCHIVES_DIR: &zonejs_packages_archives_dir "dist/zone.js-dist-archives" steps: - custom_attach_workspace - init_environment @@ -756,9 +755,9 @@ jobs: - run: yarn --cwd packages/zone.js promisetest - run: yarn --cwd packages/zone.js promisefinallytest - run: yarn bazel build //packages/zone.js:npm_package && - cp dist/bin/packages/zone.js/npm_package/bundles/zone-mix.umd.js ./packages/zone.js/test/extra/ && - cp dist/bin/packages/zone.js/npm_package/bundles/zone-patch-electron.umd.js ./packages/zone.js/test/extra/ && - cp dist/bin/packages/zone.js/npm_package/bundles/zone.umd.js ./packages/zone.js/build/test/closure/zone.js + cp dist/bin/packages/zone.js/npm_package/bundles/zone-mix.umd.js ./packages/zone.js/test/extra/ && + cp dist/bin/packages/zone.js/npm_package/bundles/zone-patch-electron.umd.js ./packages/zone.js/test/extra/ && + cp dist/bin/packages/zone.js/npm_package/bundles/zone.umd.js ./packages/zone.js/build/test/closure/zone.js - run: yarn --cwd packages/zone.js jest:test - run: yarn --cwd packages/zone.js jest:nodetest - run: yarn --cwd packages/zone.js electrontest @@ -774,11 +773,11 @@ jobs: - setup_win - run: name: Build all windows CI targets - command: yarn bazel build --build_tag_filters=-ivy-only,-no-windows //packages/compiler-cli/... //tools/ts-api-guardian/... + command: yarn bazel build --build_tag_filters=-ivy-only //packages/compiler-cli/... //tools/ts-api-guardian/... no_output_timeout: 15m - run: name: Test all windows CI targets - command: yarn bazel test --build_tag_filters=-no-windows --test_tag_filters="-ivy-only,-no-windows,-browser:chromium-local" //packages/compiler-cli/... //tools/ts-api-guardian/... + command: yarn bazel test --test_tag_filters="-ivy-only,-browser:chromium-local" //packages/compiler-cli/... //tools/ts-api-guardian/... no_output_timeout: 15m test_ivy_aot_win: @@ -787,11 +786,11 @@ jobs: - setup_win - run: name: Build all windows CI targets - command: yarn bazel build --config=ivy --build_tag_filters=-no-ivy-aot,-no-windows,-fixme-ivy-aot //packages/compiler-cli/... //tools/ts-api-guardian/... + command: yarn bazel build --config=ivy --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot //packages/compiler-cli/... //tools/ts-api-guardian/... no_output_timeout: 15m - run: name: Test all windows CI targets - command: yarn bazel test --config=ivy --build_tag_filters=-no-windows --test_tag_filters="-no-ivy-aot,-no-windows,-fixme-ivy-aot,-browser:chromium-local" //packages/compiler-cli/... //tools/ts-api-guardian/... //packages/localize/... + command: yarn bazel test --config=ivy --test_tag_filters="-no-ivy-aot,-fixme-ivy-aot,-browser:chromium-local" //packages/compiler-cli/... //tools/ts-api-guardian/... //packages/localize/... no_output_timeout: 15m # Save dependencies to use on subsequent runs. - save_cache: @@ -799,7 +798,6 @@ jobs: paths: - ~/.cache/yarn - workflows: version: 2 default_workflow: diff --git a/packages/compiler-cli/test/compliance/partial/partial_compliance_goldens.bzl b/packages/compiler-cli/test/compliance/partial/partial_compliance_goldens.bzl index 78ba8b0d71..8fe2fb41af 100644 --- a/packages/compiler-cli/test/compliance/partial/partial_compliance_goldens.bzl +++ b/packages/compiler-cli/test/compliance/partial/partial_compliance_goldens.bzl @@ -48,10 +48,6 @@ def partial_compliance_golden(filePath): testonly = True, stdout = "%s/this_file_should_not_be_committed" % path, link_workspace_root = True, - tags = [ - # TODO(josephperrott): Begin running these tests on windows after updating to rules_nodejs 3.0 - "no-windows", - ], visibility = [":__pkg__"], data = data, ) @@ -60,8 +56,6 @@ def partial_compliance_golden(filePath): visibility = ["//visibility:public"], tags = [ "ivy-only", - # TODO(josephperrott): Begin running these tests on windows after updating to rules_nodejs 3.0 - "no-windows", ], name = "%s.golden" % path, src = "//packages/compiler-cli/test/compliance/test_cases:%s/GOLDEN_PARTIAL.js" % path,