all: sync with master
This commit is contained in:
@@ -7,8 +7,8 @@
|
||||
# Make sure to sync any changes with the branch overrides below.
|
||||
'variables':
|
||||
'channel': 'edge'
|
||||
'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
|
||||
'dockerGo': 'adguard/go-builder:1.24.1--1'
|
||||
'dockerFrontend': 'adguard/home-js-builder:3.0'
|
||||
'dockerGo': 'adguard/go-builder:1.24.2--1'
|
||||
|
||||
'stages':
|
||||
- 'Build frontend':
|
||||
@@ -50,7 +50,7 @@
|
||||
'docker':
|
||||
'image': '${bamboo.dockerFrontend}'
|
||||
'volumes':
|
||||
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
|
||||
'${system.NPM_DIR}': '${bamboo.cacheNpm}'
|
||||
'key': 'BF'
|
||||
'other':
|
||||
'clean-working-dir': true
|
||||
@@ -277,8 +277,8 @@
|
||||
# need to build a few of these.
|
||||
'variables':
|
||||
'channel': 'beta'
|
||||
'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
|
||||
'dockerGo': 'adguard/go-builder:1.24.1--1'
|
||||
'dockerFrontend': 'adguard/home-js-builder:3.0'
|
||||
'dockerGo': 'adguard/go-builder:1.24.2--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]+':
|
||||
@@ -293,5 +293,5 @@
|
||||
# are the ones that actually get released.
|
||||
'variables':
|
||||
'channel': 'release'
|
||||
'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
|
||||
'dockerGo': 'adguard/go-builder:1.24.1--1'
|
||||
'dockerFrontend': 'adguard/home-js-builder:3.0'
|
||||
'dockerGo': 'adguard/go-builder:1.24.2--1'
|
||||
|
||||
Reference in New Issue
Block a user