mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 04:55:33 +03:00
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:
parent
25fd34c514
commit
86cffcd168
5 changed files with 8 additions and 8 deletions
|
@ -7,7 +7,7 @@
|
|||
# Make sure to sync any changes with the branch overrides below.
|
||||
'variables':
|
||||
'channel': 'edge'
|
||||
'dockerGo': 'adguard/golang-ubuntu:3.6'
|
||||
'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:3.6'
|
||||
'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:3.6'
|
||||
'dockerGo': 'adguard/golang-ubuntu:3.8'
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
'key': 'AHBRTSPECS'
|
||||
'name': 'AdGuard Home - Build and run tests'
|
||||
'variables':
|
||||
'dockerGo': 'adguard/golang-ubuntu:3.6'
|
||||
'dockerGo': 'adguard/golang-ubuntu:3.8'
|
||||
|
||||
'stages':
|
||||
- 'Tests':
|
||||
|
|
|
@ -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
|
||||
// associated with cmdName ignoring PIDs from ignore. Valid r's line shoud be
|
||||
// like:
|
||||
// associated with cmdName ignoring PIDs from ignore. A valid line from
|
||||
// r should look like these:
|
||||
//
|
||||
// 123 ./example-cmd
|
||||
// 1230 some/base/path/example-cmd
|
||||
|
|
|
@ -559,7 +559,7 @@ func (s *Server) IsRunning() bool {
|
|||
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.
|
||||
const srvClosedErr errors.Error = "server is closed"
|
||||
|
||||
|
|
|
@ -651,7 +651,7 @@ func newRuleStorage(filters []Filter) (rs *filterlist.RuleStorage, err error) {
|
|||
|
||||
rs, err = filterlist.NewRuleStorage(lists)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("creating rule stroage: %w", err)
|
||||
return nil, fmt.Errorf("creating rule storage: %w", err)
|
||||
}
|
||||
|
||||
return rs, nil
|
||||
|
|
Loading…
Reference in a new issue