Skip to content

Commit

Permalink
add null checks
Browse files Browse the repository at this point in the history
  • Loading branch information
dfry committed May 19, 2023
1 parent c9b0869 commit fc0b532
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions terraform/gitlab/ci-templates/bootstrap/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ cache:
- source setcivars.sh
- yq eval '.' environment.yaml -o=json > environment.json
- for var in $(jq -r 'to_entries[] | "\(.key)=\(.value)\n"' ./environment.json); do export $var; done
- echo "https://${PRIVATE_REPO_USER}:${PRIVATE_REPO_TOKEN}@github.com" > ~/.gitcredentials.store
- git config --global credential.helper 'store --file ~/.gitcredentials.store'
- if [ ! -z "$PRIVATE_REPO_USER" ]; then echo "https://${PRIVATE_REPO_USER}:${PRIVATE_REPO_TOKEN}@github.com" > ~/.gitcredentials.store; fi
- if [ ! -z "$PRIVATE_REPO_USER" ]; then git config --global credential.helper 'store --file ~/.gitcredentials.store'; fi
- git config --global advice.detachedHead false
- set
- git clone ${TEMPLATE_REPO_URL} template-repo
Expand Down
4 changes: 2 additions & 2 deletions terraform/gitlab/ci-templates/k8s-cluster/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ cache:
- source setcivars.sh
- yq eval '.' environment.yaml -o=json > environment.json
- for var in $(jq -r 'to_entries[] | "\(.key)=\(.value)\n"' ./environment.json); do export $var; done
- echo "https://${PRIVATE_REPO_USER}:${PRIVATE_REPO_TOKEN}@github.com" > ~/.gitcredentials.store
- git config --global credential.helper 'store --file ~/.gitcredentials.store'
- if [ ! -z "$PRIVATE_REPO_USER" ]; then echo "https://${PRIVATE_REPO_USER}:${PRIVATE_REPO_TOKEN}@github.com" > ~/.gitcredentials.store; fi
- if [ ! -z "$PRIVATE_REPO_USER" ]; then git config --global credential.helper 'store --file ~/.gitcredentials.store'; fi
- git config --global advice.detachedHead false
- set

Expand Down

0 comments on commit fc0b532

Please sign in to comment.