From 59cd2766e335e741a6bfe79a9f144cb4c03f0a01 Mon Sep 17 00:00:00 2001 From: Travis LaDuke Date: Mon, 31 Jan 2022 13:49:18 -0800 Subject: [PATCH 1/2] Shorten issue template. Add docs site to it. --- .github/ISSUE_TEMPLATE/bugs-and-issues.md | 34 ++++++----------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bugs-and-issues.md b/.github/ISSUE_TEMPLATE/bugs-and-issues.md index ff6f95fd9..92e6978c2 100644 --- a/.github/ISSUE_TEMPLATE/bugs-and-issues.md +++ b/.github/ISSUE_TEMPLATE/bugs-and-issues.md @@ -11,39 +11,21 @@ assignees: '' _Using these will ensure you get quicker support, and make this space available for code-related issues. Thank you!_ -- [Knowledge Base](https://zerotier.atlassian.net/wiki/spaces/SD/overview) => Guides and documentation on how to use ZeroTier. +- [Docs Site](https://docs.zerotier.com/zerotier/troubleshooting) => Troubleshooting, quickstarts, and more advanced topics. - [Discuss Forum](https://discuss.zerotier.com/) => Our discussion forum for users and support to mutually resolve issues & suggest ideas. - [Reddit](https://www.reddit.com/r/zerotier/) => Our subreddit, which we monitor regularly and is fairly active. +- [Knowledge Base](https://zerotier.atlassian.net/wiki/spaces/SD/overview) => Older wiki. + +If you are having a connection issue, it's much easier to diagnose through the discussion forum or the ticket system. + # If you still want to file a Bug Report -## Required +## Please let us know - What you expect to be happening. - What is actually happening? - Any steps to reproduce the error. -- Any screenshots that would help us out. +- Any relevant console output or screenshots. +- What operating system and ZeroTier version. Please try the latest ZeroTier release. -## Additional information - -**Desktop (please complete the following information):** - - OS: [e.g. Mac, Linux, Windows, BSD] - - OS/Distribution Version - - ZeroTier Version [e.g. 1.4.6] - -**Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - ZeroTier Version [e.g. 1.4.6] - - **Embedded & NAS (please complete the following information):** - - Device: [e.g. Synology, Pi4] - - OS/Distribution (if applicable) - - ZeroTier Version [e.g. 1.4.6] - -**Additional context** -- ZeroTier Network Configuration: IPv4 & IPv6 networks defined on your ZeroTier Central -- Router Config: are you permitting port 9993, uPnP, and NAT-PMP? -- Firewall Config: are you permitting port 9993 on your OS; setting it to "Private" on Windows? -- Are you using this at home, in an office, college, etc? -- Have you tried screaming into your router? From 269501eaa0c22bdc402e689b0d061325fb6ddbce Mon Sep 17 00:00:00 2001 From: Sean OMeara Date: Thu, 3 Feb 2022 14:18:36 +0100 Subject: [PATCH 2/2] adding drone config --- .drone.yml | 135 ++++++++++++++++++++++++++++++++++++++++++++ ci/Dockerfile.sid | 7 +++ ci/scripts/build.sh | 28 +++++++++ 3 files changed, 170 insertions(+) create mode 100644 .drone.yml create mode 100644 ci/Dockerfile.sid create mode 100755 ci/scripts/build.sh diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 000000000..8c0e0e9b0 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,135 @@ +--- +kind: pipeline +type: docker +name: build 386 + +clone: + depth: 1 + +steps: + - name: build 386 + image: registry.sean.farm/honda-builder + commands: + - ./ci/scripts/build.sh linux 386 $${DRONE_COMMIT_SHA} + +image_pull_secrets: + - dockerconfigjson + +--- +kind: pipeline +type: docker +name: build amd64 + +clone: + depth: 1 + +steps: + - name: build amd64 + image: registry.sean.farm/honda-builder + commands: + - ./ci/scripts/build.sh linux amd64 $${DRONE_COMMIT_SHA} + +image_pull_secrets: + - dockerconfigjson + +--- +kind: pipeline +type: docker +name: build arm64 + +clone: + depth: 1 + +steps: + - name: build arm64 + image: registry.sean.farm/honda-builder + commands: + - ./ci/scripts/build.sh linux arm64 $${DRONE_COMMIT_SHA} + +image_pull_secrets: + - dockerconfigjson + +--- +kind: pipeline +type: docker +name: build armv7 + +clone: + depth: 1 + +steps: + - name: build armv7 + image: registry.sean.farm/honda-builder + commands: + - ./ci/scripts/build.sh linux armv7 $${DRONE_COMMIT_SHA} + +image_pull_secrets: + - dockerconfigjson + +--- +kind: pipeline +type: docker +name: build riscv64 + +clone: + depth: 1 + +steps: + - name: build riscv64 + image: registry.sean.farm/honda-builder + commands: + - ./ci/scripts/build.sh linux riscv64 $${DRONE_COMMIT_SHA} + +image_pull_secrets: + - dockerconfigjson + +--- +kind: pipeline +type: docker +name: build mips64le + +clone: + depth: 1 + +steps: + - name: build mips64le + image: registry.sean.farm/honda-builder + commands: + - ./ci/scripts/build.sh linux mips64le $${DRONE_COMMIT_SHA} + +image_pull_secrets: + - dockerconfigjson + +--- +kind: pipeline +type: docker +name: build ppc64le + +clone: + depth: 1 + +steps: + - name: build ppc64le + image: registry.sean.farm/honda-builder + commands: + - ./ci/scripts/build.sh linux ppc64le $${DRONE_COMMIT_SHA} + +image_pull_secrets: + - dockerconfigjson + +--- +kind: pipeline +type: docker +name: build s390x + +clone: + depth: 1 + +steps: + - name: build s390x + image: registry.sean.farm/honda-builder + commands: + - ./ci/scripts/build.sh linux s390x $${DRONE_COMMIT_SHA} + +image_pull_secrets: + - dockerconfigjson diff --git a/ci/Dockerfile.sid b/ci/Dockerfile.sid new file mode 100644 index 000000000..4af604aac --- /dev/null +++ b/ci/Dockerfile.sid @@ -0,0 +1,7 @@ +FROM registry.sean.farm/sid-builder as stage +COPY . . +RUN /usr/bin/make -j 8 + +FROM scratch AS export +COPY --from=stage /zerotier-one . +COPY --from=stage /zerotier-cli . diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh new file mode 100755 index 000000000..e0b6ce6b7 --- /dev/null +++ b/ci/scripts/build.sh @@ -0,0 +1,28 @@ +#!/bin/bash +set -euo pipefail +IFS=$'\n\t' + +export GOOS=$1 +export GOARCH=$2 +export VERSION=$3 +export DOCKER_BUILDKIT=1 + +echo "nproc: $(nproc)" + +case $GOARCH in + armv5) + export ARCH=arm/v5 + ;; + armv7) + export ARCH=arm/v7 + ;; + arm64) + export ARCH=arm64/v8 + ;; + *) + export ARCH=$GOARCH + ;; +esac + +docker run --privileged --rm tonistiigi/binfmt --install all +docker buildx build --platform ${GOOS}/${ARCH} -f ci/Dockerfile.sid --target export -t test . --output out/${GOOS}/${GOARCH}