mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-24 05:55:43 +03:00
Pull request: all: upd go
Merge in DNS/adguard-home from upd-go to master Squashed commit of the following: commit 5540d0afd7579a2f2d543afaa96008d12ce1bf3e Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Feb 11 16:15:35 2022 +0300 all: upd go
This commit is contained in:
parent
a1f29c31b9
commit
18079ca1bb
3 changed files with 8 additions and 4 deletions
4
.gitattributes
vendored
4
.gitattributes
vendored
|
@ -1 +1,5 @@
|
||||||
client/* linguist-vendored
|
client/* linguist-vendored
|
||||||
|
# This file contains a lot of inline SVG data, which often interferes with
|
||||||
|
# grepping. Technically, this file must be reviewed when new icons appear, but
|
||||||
|
# that happens fairly rarely.
|
||||||
|
client/src/components/ui/Icons.js -diff
|
||||||
|
|
|
@ -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.0'
|
'dockerGo': 'adguard/golang-ubuntu:4.1'
|
||||||
|
|
||||||
'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.0'
|
'dockerGo': 'adguard/golang-ubuntu:4.1'
|
||||||
# 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.0'
|
'dockerGo': 'adguard/golang-ubuntu:4.1'
|
||||||
|
|
|
@ -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.0'
|
'dockerGo': 'adguard/golang-ubuntu:4.1'
|
||||||
|
|
||||||
'stages':
|
'stages':
|
||||||
- 'Tests':
|
- 'Tests':
|
||||||
|
|
Loading…
Reference in a new issue