Ver Fonte

Merge branch 'edge' of http://git.int.zerotier.com/zerotier/ZeroTierOne into edge

Adam Ierymenko há 5 anos atrás
pai
commit
661ebfee94

+ 0 - 1
CMakeLists.txt

@@ -93,7 +93,6 @@ if(NOT PACKAGE_STATIC)
 		set(GOFLAGS
 			-a
 			-trimpath
-			-ldflags '-w'
 		)
 
 		if(BUILD_32BIT)

+ 15 - 4
Jenkinsfile

@@ -5,7 +5,7 @@ pipeline {
         timestamps()
     }
     parameters {
-        booleanParam(name: "BUILD_ALL", defaultValue: false, description: "Build all supported platform/architecture combos.  Defaults to x86/x64 only")
+        booleanParam(name: "BUILD_ALL", defaultValue: true, description: "Build all supported platform/architecture combos.  Defaults to x86/x64 only")
     }
     environment {
         PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/home/jenkins-build/go/bin"
@@ -23,7 +23,7 @@ pipeline {
                     tasks << buildCentosNative()
                     tasks << buildMacOS()
                     tasks << buildWindows()
-                    // tasks << buildFreeBSD()
+                    tasks << buildFreeBSD()
 
                     parallel tasks
                 }
@@ -367,7 +367,7 @@ def packageStatic() {
 
 def buildDebianNative() {
     def tasks = [:]
-    def buster = ["debian-buster", /*"debian-stretch",*/ "debian-bullseye", "debian-sid"]
+    def buster = ["debian-buster" , "debian-stretch"]
     def busterArchs = []
     if (params.BUILD_ALL) {
         busterArchs = ["s390x", "ppc64le", "i386", "armhf", "armel", "arm64", "amd64"]
@@ -412,6 +412,17 @@ def buildDebianNative() {
     
     tasks << getTasks(buster, busterArchs, 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
     def xenial = ["ubuntu-xenial"]
     def xenialArchs = []
@@ -427,7 +438,7 @@ def buildDebianNative() {
     if (params.BUILD_ALL == true) {
         ubuntuArchs = ["i386", "amd64", "armhf", "arm64", "ppc64le", "s390x"]
     } else {
-        ubuntuArchs = ["i386" /*, "amd64"*/]
+        ubuntuArchs = ["i386", "amd64"]
     }
     tasks << getTasks(ubuntu, ubuntuArchs, build)
     

+ 1 - 1
dockerbuild/Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM alpine:3.11.3
+FROM alpine:3.12.0
 
 ARG go_pkg_url
 

+ 1 - 1
dockerbuild/Dockerfile.debian-sid

@@ -4,7 +4,7 @@ ARG go_pkg_url
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
 
-RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd
+RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd libssl-dev
 RUN if test "$TARGETPLATFORM" = "linux/mips64le"; then \
     apt-get install -y golang; \
     else \

+ 2 - 0
dockerbuild/Dockerfile.debian-stretch

@@ -7,6 +7,8 @@ ARG TARGETPLATFORM
 RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd libssl-dev
 
 RUN if test "$TARGETPLATFORM" = "linux/mips64le"; then \
+    echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list; \
+    apt-get update; \
     apt-get install -y golang; \
     else \
     curl -s -k $go_pkg_url -o go.tar.gz; \

+ 5 - 5
dockerbuild/Makefile

@@ -52,13 +52,13 @@ debian-stretch:
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-386.tar.gz" --platform linux/386 -f Dockerfile.debian-stretch . -t ztbuild/debian-stretch-i386 --load
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.debian-stretch . -t ztbuild/debian-stretch-ppc64le --load
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.debian-stretch . -t ztbuild/debian-stretch-s390x --load
-	docker buildx build --platform linux/mips64le -f Dockerfile.debian-sid . -t ztbuild/debian-sid-mips64le --load
+	# docker buildx build --platform linux/mips64le -f Dockerfile.debian-stretch . -t ztbuild/debian-stretch-mips64le --load
 
 debian-bullseye:
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.debian-bullseye . -t ztbuild/debian-bullseye-amd64 --load
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-arm64.tar.gz" --platform linux/arm64 -f Dockerfile.debian-bullseye . -t ztbuild/debian-bullseye-arm64 --load
-	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v6 -f Dockerfile.debian-bullseye . -t ztbuild/debian-bullseye-armel --load
-	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v7 -f Dockerfile.debian-bullseye . -t ztbuild/debian-bullseye-armhf --load
+	# docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v6 -f Dockerfile.debian-bullseye . -t ztbuild/debian-bullseye-armel --load
+	# docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v7 -f Dockerfile.debian-bullseye . -t ztbuild/debian-bullseye-armhf --load
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-386.tar.gz" --platform linux/386 -f Dockerfile.debian-bullseye . -t ztbuild/debian-bullseye-i386 --load
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.debian-bullseye . -t ztbuild/debian-bullseye-ppc64le --load
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.debian-bullseye . -t ztbuild/debian-bullseye-s390x --load
@@ -67,8 +67,8 @@ debian-bullseye:
 debian-sid:
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.debian-sid . -t ztbuild/debian-sid-amd64 --load
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-arm64.tar.gz" --platform linux/arm64 -f Dockerfile.debian-sid . -t ztbuild/debian-sid-arm64 --load
-	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v6 -f Dockerfile.debian-sid . -t ztbuild/debian-sid-armel --load
-	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v7 -f Dockerfile.debian-sid . -t ztbuild/debian-sid-armhf --load
+	# docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v6 -f Dockerfile.debian-sid . -t ztbuild/debian-sid-armel --load
+	# docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v7 -f Dockerfile.debian-sid . -t ztbuild/debian-sid-armhf --load
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-386.tar.gz" --platform linux/386 -f Dockerfile.debian-sid . -t ztbuild/debian-sid-i386 --load
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.debian-sid . -t ztbuild/debian-sid-ppc64le --load
 	docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.debian-sid . -t ztbuild/debian-sid-s390x --load