Skip to content
This repository has been archived by the owner on Mar 11, 2021. It is now read-only.

Commit

Permalink
fix(#691): load token and changes in PR correctly (#692)
Browse files Browse the repository at this point in the history
  • Loading branch information
MatousJobanek authored Dec 5, 2018
1 parent 1b2919a commit 6765ad6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cico_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -e
# that might interest this worker.
function load_jenkins_vars() {
if [ -e "jenkins-env.json" ]; then
eval "$(./env-toolkit load -f jenkins-env.json DEVSHIFT_TAG_LEN QUAY_USERNAME QUAY_PASSWORD JENKINS_URL GIT_BRANCH GIT_COMMIT BUILD_NUMBER ghprbSourceBranch ghprbActualCommit BUILD_URL ghprbPullId)"
eval "$(./env-toolkit load -f jenkins-env.json DEVSHIFT_TAG_LEN QUAY_USERNAME QUAY_PASSWORD JENKINS_URL GIT_BRANCH GIT_COMMIT BUILD_NUMBER ghprbSourceBranch ghprbActualCommit BUILD_URL ghprbPullId FABRIC8_HUB_TOKEN)"
fi
}

Expand Down Expand Up @@ -141,7 +141,7 @@ function deploy() {
function cico_setup() {
load_jenkins_vars;
install_deps;
if [[ -n `git diff --name-only ${ghprbActualCommit}..master | grep "environment/templates/"` ]]; then
if [[ -n `git diff --name-only HEAD..origin/master | grep "environment/templates/"` ]]; then
addCommentToPullRequest;
fi
prepare;
Expand Down

0 comments on commit 6765ad6

Please sign in to comment.