Pull request: all: upd go

Merge in DNS/adguard-home from upd-go to master

Squashed commit of the following:

commit 3b6c960afe073223dd73eaf650561509f0d13019
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Mar 4 15:45:15 2022 +0300

    all: upd go
This commit is contained in:
Ainar Garipov 2022-03-04 15:50:35 +03:00
parent f1d05a49f0
commit 89d9b03dfe
2 changed files with 4 additions and 4 deletions

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:4.1' 'dockerGo': 'adguard/golang-ubuntu:4.2'
'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:4.1' 'dockerGo': 'adguard/golang-ubuntu:4.2'
# 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]+':
@ -281,4 +281,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:4.1' 'dockerGo': 'adguard/golang-ubuntu:4.2'

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:4.1' 'dockerGo': 'adguard/golang-ubuntu:4.2'
'stages': 'stages':
- 'Tests': - 'Tests':