Add a hyphen to the windows suffix and archive artifacts produced by a mingw toolchain in the Jenkinsfile
This commit is contained in:
parent
8c5d36aaa4
commit
2672f33959
13
Jenkinsfile
vendored
13
Jenkinsfile
vendored
@ -8,6 +8,8 @@ def buildTarget(String path, String rpmArch = 'noarch', String debArch = 'noarch
|
|||||||
cpack installation: 'Latest', workingDir: "cmake-build-${packageArch}${suffix}"
|
cpack installation: 'Latest', workingDir: "cmake-build-${packageArch}${suffix}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String windowsSuffix = '-windows'
|
||||||
|
|
||||||
pipeline { // Multi-branch pipeline script for Yerbacon.
|
pipeline { // Multi-branch pipeline script for Yerbacon.
|
||||||
agent any
|
agent any
|
||||||
|
|
||||||
@ -36,10 +38,10 @@ pipeline { // Multi-branch pipeline script for Yerbacon.
|
|||||||
stage('Build for other platforms') {
|
stage('Build for other platforms') {
|
||||||
steps {
|
steps {
|
||||||
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
||||||
buildTarget('x86_64-w64-mingw32', 'x86_64', 'amd64', true, 'windows')
|
buildTarget('x86_64-w64-mingw32', 'x86_64', 'amd64', true, windowsSuffix)
|
||||||
buildTarget('i686-w64-mingw32', 'i386', 'i386', true, 'windows')
|
buildTarget('i686-w64-mingw32', 'i386', 'i386', true, windowsSuffix)
|
||||||
buildTarget('armv7-w64-mingw32', 'armv7hl', 'armhf', true, 'windows')
|
buildTarget('armv7-w64-mingw32', 'armv7hl', 'armhf', true, windowsSuffix)
|
||||||
buildTarget('aarch64-w64-mingw32', 'aarch64', 'arm64', false, 'windows')
|
buildTarget('aarch64-w64-mingw32', 'aarch64', 'arm64', false, windowsSuffix)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -47,6 +49,9 @@ pipeline { // Multi-branch pipeline script for Yerbacon.
|
|||||||
steps {
|
steps {
|
||||||
echo 'Deploying....'
|
echo 'Deploying....'
|
||||||
archiveArtifacts artifacts: 'cmake-build-*/*.deb, cmake-build-*/*.rpm, cmake-build-*/*.tar.gz, cmake-build-*/*.sh', fingerprint: false
|
archiveArtifacts artifacts: 'cmake-build-*/*.deb, cmake-build-*/*.rpm, cmake-build-*/*.tar.gz, cmake-build-*/*.sh', fingerprint: false
|
||||||
|
catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
|
||||||
|
archiveArtifacts artifacts: 'cmake-build-*/*wpkg.*.exe, cmake-build-*/*.zip'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user