a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request: all: upd go, minor imp 

Merge in DNS/adguard-home from minor-imp to master

Squashed commit of the following:

commit c5b9e2a15290760b2782acc0c08df3fe57356500
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 10 14:23:28 2021 +0300

    all: upd go, minor imp
This commit is contained in:
Ainar Garipov 2021-12-10 17:20:15 +03:00
parent 25fd34c514
commit 86cffcd168
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bamboo-specs/release.yaml
View File

@ -7,7 +7,7 @@
# Make sure to sync any changes with the branch overrides below. # Make sure to sync any changes with the branch overrides below.
'variables': 'variables':
'channel': 'edge' 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:3.6' 'dockerGo': 'adguard/golang-ubuntu:3.8'
'stages': 'stages':
- 'Make release': - 'Make release':
@ -266,7 +266,7 @@
# need to build a few of these. # need to build a few of these.
'variables': 'variables':
'channel': 'beta' 'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:3.6' 'dockerGo': 'adguard/golang-ubuntu:3.8'
# release-vX.Y.Z branches are the branches from which the actual final release # release-vX.Y.Z branches are the branches from which the actual final release
# is built. # is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+': - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@ -276,4 +276,4 @@
# are the ones that actually get released. # are the ones that actually get released.
'variables': 'variables':
'channel': 'release' 'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:3.6' 'dockerGo': 'adguard/golang-ubuntu:3.8'

2
bamboo-specs/test.yaml
View File

@ -5,7 +5,7 @@
'key': 'AHBRTSPECS' 'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests' 'name': 'AdGuard Home - Build and run tests'
'variables': 'variables':
'dockerGo': 'adguard/golang-ubuntu:3.6' 'dockerGo': 'adguard/golang-ubuntu:3.8'
'stages': 'stages':
- 'Tests': - 'Tests':

4
internal/aghos/os.go
View File

@ -118,8 +118,8 @@ func PIDByCommand(command string, except ...int) (pid int, err error) {
} }
// parsePSOutput scans the output of ps searching the largest PID of the process // parsePSOutput scans the output of ps searching the largest PID of the process
// associated with cmdName ignoring PIDs from ignore. Valid r's line shoud be // associated with cmdName ignoring PIDs from ignore. A valid line from
// like: // r should look like these:
// //
// 123 ./example-cmd // 123 ./example-cmd
// 1230 some/base/path/example-cmd // 1230 some/base/path/example-cmd

2
internal/dnsforward/dnsforward.go
View File

@ -559,7 +559,7 @@ func (s *Server) IsRunning() bool {
return s.isRunning return s.isRunning
} }
// srvClosedErr is returned when the method can't complete without unacessible // srvClosedErr is returned when the method can't complete without inacessible
// data from the closing server. // data from the closing server.
const srvClosedErr errors.Error = "server is closed" const srvClosedErr errors.Error = "server is closed"

2
internal/filtering/filtering.go
View File

@ -651,7 +651,7 @@ func newRuleStorage(filters []Filter) (rs *filterlist.RuleStorage, err error) {
rs, err = filterlist.NewRuleStorage(lists) rs, err = filterlist.NewRuleStorage(lists)
if err != nil { if err != nil {
return nil, fmt.Errorf("creating rule stroage: %w", err) return nil, fmt.Errorf("creating rule storage: %w", err)
} }
return rs, nil return rs, nil