From b8e32a56a139a1757ce72740b24cb9e24cbf4c8b Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Mon, 18 May 2020 20:11:39 +0200 Subject: [PATCH 1/2] ci: update components repo unit tests job commit Updates the commit the `components-repo-unit-tests` job runs against. The goal is that we run against a revision that at least contains: https://github.com/angular/components/pull/19336. The new commit contains fixes for a flaky test in the datepicker that we saw failing in the components-repo-unit-tests job too: https://app.circleci.com/pipelines/github/angular/angular/15359/workflows/27ffae7c-a7b8-46a3-9c9e-6dd22ca4734d/jobs/712643. Additionally, with this commit, the components repo unit tests job will use TypeScript 3.9.2, so we can re-enable the job in another commit. --- .circleci/config.yml | 2 +- .circleci/env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5072b542e8b9a..9cc88f784111f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ var_4_win: &cache_key_win_fallback v7-angular-win-node-12-{{ checksum ".bazelver # Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the # cache keys also update the SHA for the "COMPONENTS_REPO_COMMIT" environment variable. -var_5: &components_repo_unit_tests_cache_key v7-angular-components-448523bffffecd2b53a3d2854c3051b6b7a3934f +var_5: &components_repo_unit_tests_cache_key v7-angular-components-189d98e8b01b33974328255f085de04251d61567 var_6: &components_repo_unit_tests_cache_key_fallback v7-angular-components- # Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and diff --git a/.circleci/env.sh b/.circleci/env.sh index 20cc3e3b2fd5a..7ed6185e9d72d 100755 --- a/.circleci/env.sh +++ b/.circleci/env.sh @@ -74,7 +74,7 @@ setPublicVar COMPONENTS_REPO_TMP_DIR "/tmp/angular-components-repo" setPublicVar COMPONENTS_REPO_URL "https://github.com/angular/components.git" setPublicVar COMPONENTS_REPO_BRANCH "master" # **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI `config.yml`. -setPublicVar COMPONENTS_REPO_COMMIT "448523bffffecd2b53a3d2854c3051b6b7a3934f" +setPublicVar COMPONENTS_REPO_COMMIT "189d98e8b01b33974328255f085de04251d61567" #################################################################################################### From c1c203407e74a0f9e7f0de19e92436f4e1263096 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Mon, 18 May 2020 20:14:50 +0200 Subject: [PATCH 2/2] ci: re-enable components-repo-unit-tests job With 844208f46345e285cf789de431fa87f1bb483375, we disabled the components-repo-unit-tests job. The components repo landed the required TS 3.9.x update, so we can re-enable the job again. --- .circleci/config.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9cc88f784111f..63ba906c9920f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -848,12 +848,9 @@ workflows: - build-npm-packages - build-ivy-npm-packages - legacy-unit-tests-saucelabs - # The below 'components-repo-unit-tests' is disabled until the Components team support building and testing their - # repo with TypeScript 3.9. The TS 3.9 update is being done in https://github.com/angular/components/pull/19336. - # We should re-enable this CI job, when the mentioned PR gets merged. - # - components-repo-unit-tests: - # requires: - # - build-npm-packages + - components-repo-unit-tests: + requires: + - build-npm-packages - test_zonejs: requires: - setup