Skip to content

Commit 9d3f84b

Browse files
fix(CI): don't use change author on master (#95)
1 parent 886633b commit 9d3f84b

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
Dockerfile
22
vendor
3+
.git

Jenkinsfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,26 +119,29 @@ def mktmp = {
119119
}
120120

121121
node('linux') {
122-
flags = ""
122+
def author = "deis"
123+
def flags = ""
124+
123125
if (git_branch != "remotes/origin/master") {
126+
author = env.CHANGE_AUTHOR
124127
echo "Skipping build of 386 binaries to shorten CI for Pull Requests"
125128
flags += "-e BUILD_ARCH=amd64"
126129
}
127130

128-
tmp_dir = mktmp()
129-
dist_dir = "-e DIST_DIR=/upload -v ${tmp_dir}:/upload"
131+
def tmp_dir = mktmp()
132+
def dist_dir = "-e DIST_DIR=/upload -v ${tmp_dir}:/upload"
130133

131134
def pattern = "github\\.com\\/deis\\/controller-sdk-go\\n\\s+version:\\s+[a-f0-9]+"
132-
replacement = "github\\.com\\/deis\\/controller-sdk-go\\n"
133-
replacement += " repo: https:\\/\\/github\\.com\\/${env.CHANGE_AUTHOR}\\/controller-sdk-go\\.git\\n"
135+
def replacement = "github\\.com\\/deis\\/controller-sdk-go\\n"
136+
replacement += " repo: https:\\/\\/github\\.com\\/${author}\\/controller-sdk-go\\.git\\n"
134137
replacement += " vcs: git\\n"
135138
replacement += " version: ${git_commit}"
136139

137-
build_script = "sh -c 'perl -i -0pe \"s/${pattern}/${replacement}/\" glide.yaml "
140+
def build_script = "sh -c 'perl -i -0pe \"s/${pattern}/${replacement}/\" glide.yaml "
138141
build_script += "&& rm -rf glide.lock vendor/github.com/deis/controller-sdk-go "
139142
build_script += "&& glide install "
140143
build_script += "&& make build-revision'"
141-
sh "docker run ${flags} -e REVISION=${git_commit.take(7)} ${dist_dir} --rm ${wcli_image} ${build_script}"
144+
sh "docker run ${flags} -e GIT_TAG=csdk -e REVISION=${git_commit.take(7)} ${dist_dir} --rm ${wcli_image} ${build_script}"
142145

143146
upload_artifacts(dist_dir)
144147
sh "rm -rf ${tmp_dir}"

0 commit comments

Comments
 (0)