s390x all static

This commit is contained in:
Grant Limberg 2020-06-30 11:06:33 -07:00
parent 115187204f
commit 536be73006
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A

14
Jenkinsfile vendored
View file

@ -198,7 +198,7 @@ def packageStatic() {
}) })
if (params.BUILD_ALL == true) { if (params.BUILD_ALL == true) {
def clefos7 = ["clefos"] def s390xStatics = ["clefos", "debian-buster", "debian-sid", "debian-bullseye", "debian-stretch", "ubuntu-bionic", "ubuntu-eoan", "ubuntu-focal"]
def clefos7Arch = ["s390x"] def clefos7Arch = ["s390x"]
tasks << getTasks(clefos7, clefos7Arch, { distro, arch -> tasks << getTasks(clefos7, clefos7Arch, { distro, arch ->
def myNode = { def myNode = {
@ -208,12 +208,16 @@ def packageStatic() {
checkout scm checkout scm
} }
def runtime = docker.image("ztbuild/${distro}-${arch}:latest") def runtime = docker.image("ztbuild/${distro}-${arch}:latest")
def pkgFormat = "DEB"
if (distro == "clefos") {
pkgFormat = "RPM"
}
runtime.inside { runtime.inside {
dir("build/") { dir("build/") {
unstash "static-${arch}" unstash "static-${arch}"
sh "mkdir -p build" sh "mkdir -p build"
sh "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier" sh "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier"
sh 'CMAKE_ARGS="-DPACKAGE_STATIC=1 -DZT_PACKAGE_FORMAT=RPM" make setup' sh "CMAKE_ARGS=\"-DPACKAGE_STATIC=1 -DZT_PACKAGE_FORMAT=${pkgFormat}\" make setup"
dir("build") { dir("build") {
sh 'make package -j4 VERBOSE=1' sh 'make package -j4 VERBOSE=1'
} }
@ -368,7 +372,7 @@ def buildDebianNative() {
def debian = ["debian-buster" , "debian-stretch", "debian-sid", "debian-bullseye"] def debian = ["debian-buster" , "debian-stretch", "debian-sid", "debian-bullseye"]
def debianArchs = [] def debianArchs = []
if (params.BUILD_ALL) { if (params.BUILD_ALL) {
debianArchs = ["s390x", "ppc64le", "i386", "armhf", "armel", "arm64", "amd64"] debianArchs = ["ppc64le", "i386", "armhf", "armel", "arm64", "amd64"]
} else { } else {
debianArchs = ["amd64", "i386"] debianArchs = ["amd64", "i386"]
} }
@ -422,7 +426,7 @@ def buildDebianNative() {
def ubuntu = ["ubuntu-bionic", "ubuntu-eoan"] def ubuntu = ["ubuntu-bionic", "ubuntu-eoan"]
def ubuntuArchs = [] def ubuntuArchs = []
if (params.BUILD_ALL == true) { if (params.BUILD_ALL == true) {
ubuntuArchs = ["i386", "amd64", "armhf", "arm64", "ppc64le", "s390x"] ubuntuArchs = ["i386", "amd64", "armhf", "arm64", "ppc64le"]
} else { } else {
ubuntuArchs = ["i386", "amd64"] ubuntuArchs = ["i386", "amd64"]
} }
@ -431,7 +435,7 @@ def buildDebianNative() {
def ubuntuFocal = ["ubuntu-focal"] def ubuntuFocal = ["ubuntu-focal"]
def ubuntuFocalArchs = [] def ubuntuFocalArchs = []
if (params.BUILD_ALL == true) { if (params.BUILD_ALL == true) {
ubuntuFocalArchs = ["amd64", "arm64", "ppc64le", "s390x"] ubuntuFocalArchs = ["amd64", "arm64", "ppc64le"]
} else { } else {
ubuntuFocalArchs = ["amd64"] ubuntuFocalArchs = ["amd64"]
} }