From 8f9053e2fc7a2eca4300514d4d2499f69fd7551c Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Wed, 29 Dec 2021 16:09:01 +0300 Subject: [PATCH] all: backport, prepare release --- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 2 +- CHANGELOG.md | 10 +++++----- bamboo-specs/release.yaml | 6 +++--- bamboo-specs/test.yaml | 2 +- go.mod | 31 +++---------------------------- go.sum | 4 ++-- scripts/make/go-lint.sh | 2 +- 8 files changed, 17 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af2dd565..31f0258b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ 'name': 'build' 'env': - 'GO_VERSION': '1.17' + 'GO_VERSION': '1.16' 'NODE_VERSION': '14' 'on': diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c1faeaa9..18285511 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,7 @@ 'name': 'lint' 'env': - 'GO_VERSION': '1.17' + 'GO_VERSION': '1.16' 'on': 'push': diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d0b2ee5..02733a68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,11 +17,6 @@ and this project adheres to - `windows/arm64` support ([#3057]). -### Changed - -- The validation error message for duplicated allow- and blocklists in DNS - settings now shows the duplicated elements ([#3975]). - ### Deprecated ## v0.107.1 - UNRELEASED +### Changed + +- The validation error message for duplicated allow- and blocklists in DNS + settings now shows the duplicated elements ([#3975]). + ### Fixed - `ipset` initialization bugs ([#4027]). diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index c180e5fb..325705ae 100644 --- a/bamboo-specs/release.yaml +++ b/bamboo-specs/release.yaml @@ -7,7 +7,7 @@ # Make sure to sync any changes with the branch overrides below. 'variables': 'channel': 'edge' - 'dockerGo': 'adguard/golang-ubuntu:4.0' + 'dockerGo': 'adguard/golang-ubuntu:3.8' 'stages': - 'Make release': @@ -266,7 +266,7 @@ # need to build a few of these. 'variables': 'channel': 'beta' - 'dockerGo': 'adguard/golang-ubuntu:4.0' + 'dockerGo': 'adguard/golang-ubuntu:3.8' # release-vX.Y.Z branches are the branches from which the actual final release # is built. - '^release-v[0-9]+\.[0-9]+\.[0-9]+': @@ -276,4 +276,4 @@ # are the ones that actually get released. 'variables': 'channel': 'release' - 'dockerGo': 'adguard/golang-ubuntu:4.0' + 'dockerGo': 'adguard/golang-ubuntu:3.8' diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml index c6a2ffee..9b427e5a 100644 --- a/bamboo-specs/test.yaml +++ b/bamboo-specs/test.yaml @@ -5,7 +5,7 @@ 'key': 'AHBRTSPECS' 'name': 'AdGuard Home - Build and run tests' 'variables': - 'dockerGo': 'adguard/golang-ubuntu:4.0' + 'dockerGo': 'adguard/golang-ubuntu:3.8' 'stages': - 'Tests': diff --git a/go.mod b/go.mod index a9a5f8e4..fa7c58fd 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module github.com/AdguardTeam/AdGuardHome -go 1.17 +go 1.16 require ( - github.com/AdguardTeam/dnsproxy v0.40.2 + github.com/AdguardTeam/dnsproxy v0.40.3-0.20211229125141-da9b0c6cf76a github.com/AdguardTeam/golibs v0.10.3 github.com/AdguardTeam/urlfilter v0.15.1 github.com/NYTimes/gziphandler v1.1.1 @@ -33,29 +33,4 @@ require ( howett.net/plist v0.0.0-20201203080718-1454fab16a06 ) -require ( - github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect - github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect - github.com/ameshkov/dnsstamps v1.0.3 // indirect - github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect - github.com/cheekybits/genny v1.0.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect - github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect - github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect - github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect - github.com/nxadm/tail v1.4.8 // indirect - github.com/onsi/ginkgo v1.16.5 // indirect - github.com/patrickmn/go-cache v2.1.0+incompatible // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/stretchr/objx v0.1.1 // indirect - github.com/u-root/u-root v7.0.0+incompatible // indirect - golang.org/x/mod v0.5.1 // indirect - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/text v0.3.7 // indirect - golang.org/x/tools v0.1.8 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect -) +require github.com/stretchr/objx v0.1.1 // indirect diff --git a/go.sum b/go.sum index ff30440e..82ed8f92 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBr dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= -github.com/AdguardTeam/dnsproxy v0.40.2 h1:GG4StH+d4rB7YW3d20sdQjJG8URUeaIQicnEAsYJY7w= -github.com/AdguardTeam/dnsproxy v0.40.2/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= +github.com/AdguardTeam/dnsproxy v0.40.3-0.20211229125141-da9b0c6cf76a h1:m+84VGYbDBq55L5apbHj1UqbZOcK1lqmnZVlBvzycmk= +github.com/AdguardTeam/dnsproxy v0.40.3-0.20211229125141-da9b0c6cf76a/go.mod h1:+NlQl9lcVKjbecYlCumfjMzDk2BblySEX7WOHhQBbXk= github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= github.com/AdguardTeam/golibs v0.9.2/go.mod h1:fCAMwPBJ8S7YMYbTWvYS+eeTLblP5E04IDtNAo7y7IY= diff --git a/scripts/make/go-lint.sh b/scripts/make/go-lint.sh index 168aee55..6ed9b503 100644 --- a/scripts/make/go-lint.sh +++ b/scripts/make/go-lint.sh @@ -52,7 +52,7 @@ trap not_found EXIT go_version="$( "$GO" version )" readonly go_version -go_min_version='go1.17' +go_min_version='go1.16' go_version_msg=" warning: your go version (${go_version}) is different from the recommended minimal one (${go_min_version}). if you have the version installed, please set the GO environment variable.