Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Temporary commit. DO NOT MERGE UPSTREAM.
  • Loading branch information
gregmagolan committed Nov 6, 2019
1 parent dcead00 commit a1428fe
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var_4_win: &cache_key_win_fallback v5-angular-win-node-12.0-

# Cache key for the Material unit tests job. **Note** when updating the SHA in the cache keys,
# also update the SHA for the "MATERIAL_REPO_COMMIT" environment variable.
var_5: &material_unit_tests_cache_key v5-angular-material-50514b2358f394f1f6d634fa181b563b7edd738b
var_5: &material_unit_tests_cache_key v5-angular-material-2d427b57f9b9fba28eb12548b378d44f01ba44e3
var_6: &material_unit_tests_cache_key_fallback v5-angular-material-

# Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
Expand Down
8 changes: 4 additions & 4 deletions .circleci/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ setPublicVar SAUCE_READY_FILE_TIMEOUT 120
# We specifically use a directory within "/tmp" here because we want the cloned repo to be
# completely isolated from angular/angular in order to avoid any bad interactions between
# their separate build setups.
setPublicVar MATERIAL_REPO_TMP_DIR "/tmp/material2"
setPublicVar MATERIAL_REPO_URL "https://github.com/angular/material2.git"
setPublicVar MATERIAL_REPO_BRANCH "master"
setPublicVar MATERIAL_REPO_TMP_DIR "/tmp/gregmagolan/material2"
setPublicVar MATERIAL_REPO_URL "https://github.com/gregmagolan/components.git"
setPublicVar MATERIAL_REPO_BRANCH "prereq_angular_33607"
# **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI "config.yml".
setPublicVar MATERIAL_REPO_COMMIT "50514b2358f394f1f6d634fa181b563b7edd738b"
setPublicVar MATERIAL_REPO_COMMIT "2d427b57f9b9fba28eb12548b378d44f01ba44e3"

# Source `$BASH_ENV` to make the variables available immediately.
source $BASH_ENV;

0 comments on commit a1428fe

Please sign in to comment.