Skip to content

Commit a116b91

Browse files
authored
Merge pull request #126 from infosiftr/buildx-setup
Always setup buildkit
2 parents 2b04d9e + 7e9250a commit a116b91

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

Jenkinsfile.build

+8-10
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,14 @@ node('multiarch-' + env.BASHBREW_ARCH) { ansiColor('xterm') {
123123

124124
def buildEnvs = []
125125
stage('Prep') {
126-
if (obj.commands.build.contains(' buildx ')) {
127-
def json = sh(returnStdout: true, script: '''#!/usr/bin/env bash
128-
set -Eeuo pipefail -x
129-
130-
.doi/.bin/bashbrew-buildkit-env-setup.sh \\
131-
| jq 'to_entries | map(.key + "=" + .value)'
132-
''').trim()
133-
if (json) {
134-
buildEnvs += readJSON(text: json)
135-
}
126+
def json = sh(returnStdout: true, script: '''#!/usr/bin/env bash
127+
set -Eeuo pipefail -x
128+
129+
.doi/.bin/bashbrew-buildkit-env-setup.sh \\
130+
| jq 'to_entries | map(.key + "=" + .value)'
131+
''').trim()
132+
if (json) {
133+
buildEnvs += readJSON(text: json)
136134
}
137135
}
138136

0 commit comments

Comments
 (0)