void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 04:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

reenable some temporarily disabled stuff

Browse source
This commit is contained in:
Grant Limberg 2020-06-30 09:59:18 -07:00
parent 722a50f7be
commit b482064a55
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Jenkinsfile vendored
View file

@ -365,12 +365,12 @@ def packageStatic() {
def buildDebianNative() { def buildDebianNative() {
def tasks = [:] def tasks = [:]
def buster = ["debian-buster" , "debian-stretch"] def debian = ["debian-buster" , "debian-stretch", "debian-sid", "debian-bullseye"]
def busterArchs = [] def debianArchs = []
if (params.BUILD_ALL) { if (params.BUILD_ALL) {
busterArchs = ["s390x", "ppc64le", "i386", "armhf", "armel", "arm64", "amd64"] debianArchs = ["s390x", "ppc64le", "i386", "armhf", "armel", "arm64", "amd64"]
} else { } else {
busterArchs = ["amd64", "i386"] debianArchs = ["amd64", "i386"]
} }
def build = { distro, arch -> def build = { distro, arch ->
@ -408,19 +408,8 @@ def buildDebianNative() {
return myNode return myNode
} }
tasks << getTasks(buster, busterArchs, build) tasks << getTasks(debian, debianArchs, build)
// 32-bit arm and CMake don't get along right now on Sid/Bullseye
def sid = ["debian-sid", "debian-bullseye"]
def sidArchs = []
if (params.BUILD_ALL) {
busterArchs = ["s390x", "ppc64le", "i386", /*"armhf", "armel",*/ "arm64", "amd64", "mips64le"]
} else {
busterArchs = ["amd64", "i386"]
}
tasks << getTasks(sid, sidArchs, build)
// bash is broken when running under QEMU-s390x on Xenial // bash is broken when running under QEMU-s390x on Xenial
def xenial = ["ubuntu-xenial"] def xenial = ["ubuntu-xenial"]
def xenialArchs = [] def xenialArchs = []
@ -429,7 +418,7 @@ def buildDebianNative() {
} else { } else {
xenialArchs = ["i386", "amd64"] xenialArchs = ["i386", "amd64"]
} }
//tasks << getTasks(xenial, xenialArchs, build) tasks << getTasks(xenial, xenialArchs, build)
def ubuntu = ["ubuntu-bionic", "ubuntu-eoan"] def ubuntu = ["ubuntu-bionic", "ubuntu-eoan"]
def ubuntuArchs = [] def ubuntuArchs = []