daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ADG-9415

Browse Source
This commit is contained in:
Ildar Kamalov
2025-02-07 15:00:58 +03:00
parent 391d577aca b92a3cfb89
commit f8fbf96547
11 changed files with 199 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bamboo-specs/release.yaml
View File

@@ -8,7 +8,7 @@
'variables':
'channel': 'edge'
'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
'dockerGo': 'adguard/go-builder:1.23.5--1'
'dockerGo': 'adguard/go-builder:1.23.6--1'
'stages':
- 'Build frontend':
@@ -278,7 +278,7 @@
'variables':
'channel': 'beta'
'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
'dockerGo': 'adguard/go-builder:1.23.5--1'
'dockerGo': 'adguard/go-builder:1.23.6--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.1-bullseye'
'dockerGo': 'adguard/go-builder:1.23.5--1'
'dockerGo': 'adguard/go-builder:1.23.6--1'

4
bamboo-specs/test.yaml
View File

@@ -6,7 +6,7 @@
'name': 'AdGuard Home - Build and run tests'
'variables':
'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
'dockerGo': 'adguard/go-builder:1.23.5--1'
'dockerGo': 'adguard/go-builder:1.23.6--1'
'channel': 'development'
'stages':
@@ -234,5 +234,5 @@
# may need to build a few of these.
'variables':
'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
'dockerGo': 'adguard/go-builder:1.23.5--1'
'dockerGo': 'adguard/go-builder:1.23.6--1'
'channel': 'candidate'