From dc2c68b1e4ff625deb44850a84282cdce56d1cd5 Mon Sep 17 00:00:00 2001 From: Simon Zolin Date: Mon, 25 Nov 2019 14:10:04 +0300 Subject: [PATCH] * use Go v1.13 --- .travis.yml | 6 +++--- README.md | 2 +- go.mod | 4 ++-- go.sum | 3 +++ home/home.go | 11 ----------- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcf23a77..3d5f0cc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: go sudo: false go: - - 1.12.x + - 1.13.x os: - linux - osx @@ -35,7 +35,7 @@ matrix: # Release build configuration - name: release go: - - 1.12.x + - 1.13.x os: - linux @@ -63,7 +63,7 @@ matrix: - name: docker if: type != pull_request AND (branch = master OR tag IS present) go: - - 1.12.x + - 1.13.x os: - linux services: diff --git a/README.md b/README.md index 7efef544..2ba26d85 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ It depends. You will need: - * [go](https://golang.org/dl/) v1.12 or later. + * [go](https://golang.org/dl/) v1.13 or later. * [node.js](https://nodejs.org/en/download/) v10 or later. You can either install it via the provided links or use [brew.sh](https://brew.sh/) if you're on Mac: diff --git a/go.mod b/go.mod index 51385b67..8c27a81a 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/AdguardTeam/AdGuardHome -go 1.12 +go 1.13 require ( github.com/AdguardTeam/dnsproxy v0.19.6 github.com/AdguardTeam/golibs v0.3.0 - github.com/AdguardTeam/urlfilter v0.6.1 + github.com/AdguardTeam/urlfilter v0.6.2 github.com/NYTimes/gziphandler v1.1.1 github.com/etcd-io/bbolt v1.3.3 github.com/go-test/deep v1.0.4 // indirect diff --git a/go.sum b/go.sum index 065a1622..90b83902 100644 --- a/go.sum +++ b/go.sum @@ -2,12 +2,15 @@ github.com/AdguardTeam/dnsproxy v0.19.6 h1:66hBrCMDIlaMXu8AiB4fHXxnX7Q6MDIuUn7gh github.com/AdguardTeam/dnsproxy v0.19.6/go.mod h1:61N+71pTD0+nRQWBc0BNh3Ayl3NIW+KZ1sF2+ZObsSA= github.com/AdguardTeam/golibs v0.1.3 h1:hmapdTtMtIk3T8eQDwTOLdqZLGDKNKk9325uC8z12xg= github.com/AdguardTeam/golibs v0.1.3/go.mod h1:b0XkhgIcn2TxwX6C5AQMtpIFAgjPehNgxJErWkwA3ko= +github.com/AdguardTeam/golibs v0.2.2/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U= github.com/AdguardTeam/golibs v0.2.4 h1:GUssokegKxKF13K67Pgl0ZGwqHjNN6X7sep5ik6ORdY= github.com/AdguardTeam/golibs v0.2.4/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U= github.com/AdguardTeam/golibs v0.3.0 h1:1zO8ulGEOdXDDM++Ap4sYfTsT/Z4tZBZtiWSA4ykcOU= github.com/AdguardTeam/golibs v0.3.0/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U= github.com/AdguardTeam/urlfilter v0.6.1 h1:JX3gNYmgD9TCWE+G0C4MOn8WHYLAoVt0agltSvfldkY= github.com/AdguardTeam/urlfilter v0.6.1/go.mod h1:y+XdxBdbRG9v7pfjznlvv4Ufi2HTG8D0YMqR22OVy0Y= +github.com/AdguardTeam/urlfilter v0.6.2 h1:YCM6o+INsGl9E1I6L1MbPYOsAS4LuBOkDHQ8o9dJQno= +github.com/AdguardTeam/urlfilter v0.6.2/go.mod h1:hw/9VMuSDbcIYlnQ2Ucwr+cdVzHOyvKoLVcj1WMNf+w= github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s= diff --git a/home/home.go b/home/home.go index afbb3002..1569e796 100644 --- a/home/home.go +++ b/home/home.go @@ -74,9 +74,6 @@ func run(args options) { // configure log level and output configureLogger(args) - // enable TLS 1.3 - enableTLS13() - // print the first message after logger is configured log.Printf("AdGuard Home, version %s, channel %s\n", versionString, updateChannel) log.Debug("Current working directory is %s", config.ourWorkingDir) @@ -358,14 +355,6 @@ func configureLogger(args options) { } } -// TODO after GO 1.13 release TLS 1.3 will be enabled by default. Remove this afterward -func enableTLS13() { - err := os.Setenv("GODEBUG", os.Getenv("GODEBUG")+",tls13=1") - if err != nil { - log.Fatalf("Failed to enable TLS 1.3: %s", err) - } -} - func cleanup() { log.Info("Stopping AdGuard Home")