From 045a989a031e6e9db7ac8991d658c92cc9350393 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Mon, 3 Feb 2020 18:58:39 +0100 Subject: [PATCH] ci: update components-repo-unit-tests job commit (#35123) Updates the commit the `components-repo-unit-tests` job runs against. We need at least https://github.com/angular/components/commit/2ec7254f88c4865e0de251f74c27e64c9d00d40a which fixes a Ngcc postinstall patch conflict that required us to temporarily disable the job in #35079. PR Close #35123 --- .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 317d3df312..920227a21b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ var_4_win: &cache_key_win_fallback v5-angular-win-node-12- # 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 v5-angular-components-97a7e2babbccd3dc58e7b3364004e45ed5bd9968 +var_5: &components_repo_unit_tests_cache_key v5-angular-components-2ec7254f88c4865e0de251f74c27e64c9d00d40a var_6: &components_repo_unit_tests_cache_key_fallback v5-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 5fd67478a0..d7613eb123 100755 --- a/.circleci/env.sh +++ b/.circleci/env.sh @@ -77,7 +77,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 "97a7e2babbccd3dc58e7b3364004e45ed5bd9968" +setPublicVar COMPONENTS_REPO_COMMIT "2ec7254f88c4865e0de251f74c27e64c9d00d40a" ####################################################################################################