all: sync with master
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
'variables':
|
||||
'channel': 'edge'
|
||||
'dockerFrontend': 'adguard/home-js-builder:2.0'
|
||||
'dockerGo': 'adguard/go-builder:1.23.4--1'
|
||||
'dockerGo': 'adguard/go-builder:1.23.5--1'
|
||||
|
||||
'stages':
|
||||
- 'Build frontend':
|
||||
@@ -278,7 +278,7 @@
|
||||
'variables':
|
||||
'channel': 'beta'
|
||||
'dockerFrontend': 'adguard/home-js-builder:2.0'
|
||||
'dockerGo': 'adguard/go-builder:1.23.4--1'
|
||||
'dockerGo': 'adguard/go-builder:1.23.5--1'
|
||||
# release-vX.Y.Z branches are the branches from which the actual final
|
||||
# release is built.
|
||||
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
|
||||
@@ -294,4 +294,4 @@
|
||||
'variables':
|
||||
'channel': 'release'
|
||||
'dockerFrontend': 'adguard/home-js-builder:2.0'
|
||||
'dockerGo': 'adguard/go-builder:1.23.4--1'
|
||||
'dockerGo': 'adguard/go-builder:1.23.5--1'
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
'name': 'AdGuard Home - Build and run tests'
|
||||
'variables':
|
||||
'dockerFrontend': 'adguard/home-js-builder:2.0'
|
||||
'dockerGo': 'adguard/go-builder:1.23.4--1'
|
||||
'dockerGo': 'adguard/go-builder:1.23.5--1'
|
||||
'channel': 'development'
|
||||
|
||||
'stages':
|
||||
@@ -196,5 +196,5 @@
|
||||
# may need to build a few of these.
|
||||
'variables':
|
||||
'dockerFrontend': 'adguard/home-js-builder:2.0'
|
||||
'dockerGo': 'adguard/go-builder:1.23.4--1'
|
||||
'dockerGo': 'adguard/go-builder:1.23.5--1'
|
||||
'channel': 'candidate'
|
||||
|
||||
Reference in New Issue
Block a user