Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit b3b8d21

Browse files
Splaktarmmalerba
authored andcommitted
chore(ci): only unset the CircleCI SSH override once (#11624)
Relates to #11592.
1 parent 3317180 commit b3b8d21

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ jobs:
155155
- *restore_cache
156156
- *npm_install
157157
- run: sudo npm i -g [email protected]
158+
- run: git config --global --unset url.ssh://[email protected]
158159
- run: ./scripts/circleci/update-snapshot-and-docs.sh --sha=${CIRCLE_SHA1}
159160

160161
# ----------------------------------------------------------------------------------------

scripts/bower-material-release.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ function run {
3131
commitAuthorName=$(git --no-pager show -s --format='%an' HEAD)
3232
commitAuthorEmail=$(git --no-pager show -s --format='%ae' HEAD)
3333

34-
cd bower-material
34+
cd bower-material/
3535

3636
git config user.name "${commitAuthorName}"
3737
git config user.email "${commitAuthorEmail}"
38-
# Disable CircleCI's forced use of SSH with GitHub
39-
git config --global --unset url.ssh://[email protected]
4038
# GitHub personal access token with push permission specified as environment variable
4139
git config credential.helper "store --file=.git/credentials"
4240
echo "https://${ANGULARJS_MATERIAL_BOWER_TOKEN}:@github.com" > .git/credentials

scripts/snapshot-docs-site.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,8 @@ function run {
3636

3737
git config user.name "${commitAuthorName}"
3838
git config user.email "${commitAuthorEmail}"
39-
git config credential.helper "store --file .git/credentials"
40-
# Disable CircleCI's forced use of SSH with GitHub
41-
echo "-- Removing CircleCI's forced use of SSH..."
42-
git config --global --unset url.ssh://[email protected]
4339
# GitHub personal access token with push permission specified as environment variable
40+
git config credential.helper "store --file .git/credentials"
4441
echo "-- Storing credentials..."
4542
echo "https://${ANGULARJS_MATERIAL_DOCS_SITE_TOKEN}:@github.com" > .git/credentials
4643

0 commit comments

Comments
 (0)