From 3b37db1a3699c415d5abeaa12d0e9f1ce4550b77 Mon Sep 17 00:00:00 2001 From: capruro <64908287+capruro@users.noreply.github.com> Date: Fri, 3 Dec 2021 14:30:05 +0100 Subject: [PATCH 1/3] Version bump to 1.8.4 --- ext/installfiles/linux/zerotier-containerized/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/installfiles/linux/zerotier-containerized/Dockerfile b/ext/installfiles/linux/zerotier-containerized/Dockerfile index ab286e34c..f0386c800 100644 --- a/ext/installfiles/linux/zerotier-containerized/Dockerfile +++ b/ext/installfiles/linux/zerotier-containerized/Dockerfile @@ -7,11 +7,11 @@ FROM debian:buster-slim as builder RUN apt-get update && apt-get install -y curl gnupg RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 0x1657198823e52a61 && \ echo "deb http://download.zerotier.com/debian/buster buster main" > /etc/apt/sources.list.d/zerotier.list -RUN apt-get update && apt-get install -y zerotier-one=1.6.2 +RUN apt-get update && apt-get install -y zerotier-one=1.8.4 COPY ext/installfiles/linux/zerotier-containerized/main.sh /var/lib/zerotier-one/main.sh FROM debian:buster-slim -LABEL version="1.6.3" +LABEL version="1.8.4" LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts." # ZeroTier relies on UDP port 9993 From 3470c5314d039804ea4f3e166adf47f2ef8b5ac1 Mon Sep 17 00:00:00 2001 From: Sean OMeara Date: Mon, 13 Dec 2021 21:25:17 +0100 Subject: [PATCH 2/3] removing commit linter --- .github/workflows/badstrings.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .github/workflows/badstrings.yml diff --git a/.github/workflows/badstrings.yml b/.github/workflows/badstrings.yml deleted file mode 100644 index cb8e96690..000000000 --- a/.github/workflows/badstrings.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: badstrings -on: [pull_request, push] -jobs: - badstrings: - runs-on: ubuntu-latest - steps: - - name: scanning commit message for bad strings - run: | - #!/bin/bash - set -euo pipefail - IFS=$'\n\t' - message="${{ github.event.head_commit.message }}" - - strings=($(curl -s https://raw.githubusercontent.com/someara/badstrings/main/strings.txt)) - for i in ${strings[@]} ; do - echo "${message}" | grep -v "$i" &>/dev/null; - done From 4128d80974c6a2f399da5ac78360f8a412e1d350 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 17 Dec 2021 17:40:00 -0500 Subject: [PATCH 3/3] 1.8.5 version bump. --- debian/changelog | 6 ++++++ ext/installfiles/mac/ZeroTier One.pkgproj | 2 +- version.h | 2 +- zerotier-one.spec | 5 ++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 97ab9b0e5..f9ff08746 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zerotier-one (1.8.5) unstable; urgency=medium + + * See RELEASE-NOTES.md for release notes. + + -- Adam Ierymenko Fri, 17 Dec 2021 01:00:00 -0700 + zerotier-one (1.8.4) unstable; urgency=medium * See RELEASE-NOTES.md for release notes. diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj index 852b15fff..c4ca48901 100755 --- a/ext/installfiles/mac/ZeroTier One.pkgproj +++ b/ext/installfiles/mac/ZeroTier One.pkgproj @@ -701,7 +701,7 @@ USE_HFS+_COMPRESSION VERSION - 1.8.4 + 1.8.5 TYPE 0 diff --git a/version.h b/version.h index 943126236..e4e7e4cc4 100644 --- a/version.h +++ b/version.h @@ -27,7 +27,7 @@ /** * Revision */ -#define ZEROTIER_ONE_VERSION_REVISION 4 +#define ZEROTIER_ONE_VERSION_REVISION 5 /** * Build version diff --git a/zerotier-one.spec b/zerotier-one.spec index a3520121d..16b9171d4 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -1,5 +1,5 @@ Name: zerotier-one -Version: 1.8.4 +Version: 1.8.5 Release: 1%{?dist} Summary: ZeroTier network virtualization service @@ -152,6 +152,9 @@ esac %endif %changelog +* Fri Dec 17 2021 Adam Ierymenko - 1.8.5 +- see https://github.com/zerotier/ZeroTierOne for release notes + * Tue Nov 23 2021 Adam Ierymenko - 1.8.4 - see https://github.com/zerotier/ZeroTierOne for release notes