Pull request 2425: Update all

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

Squashed commit of the following:

commit 7e0b4435b5df6b8415a3c8a4dbd59d75750e545f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Jun 10 15:52:49 2025 +0300

    client: upd i18n

commit 5c17d66cf44fb331668d7a846b72b3b33eebc33c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Jun 10 15:45:09 2025 +0300

    filtering: upd blocked services

commit 6a1d473beb03a602cff4e38114a51e79a93708d5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Jun 10 15:38:03 2025 +0300

    all: upd go & tools
This commit is contained in:
Eugene Burkov
2025-06-10 16:58:45 +03:00
parent 490144af39
commit 16fda88899
11 changed files with 46 additions and 26 deletions

View File

@@ -8,7 +8,7 @@
'variables':
'channel': 'edge'
'dockerFrontend': 'adguard/home-js-builder:3.1'
'dockerGo': 'adguard/go-builder:1.24.3--1'
'dockerGo': 'adguard/go-builder:1.24.4--1'
'stages':
- 'Build frontend':
@@ -279,7 +279,7 @@
'variables':
'channel': 'beta'
'dockerFrontend': 'adguard/home-js-builder:3.1'
'dockerGo': 'adguard/go-builder:1.24.3--1'
'dockerGo': 'adguard/go-builder:1.24.4--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]+':
@@ -295,4 +295,4 @@
'variables':
'channel': 'release'
'dockerFrontend': 'adguard/home-js-builder:3.1'
'dockerGo': 'adguard/go-builder:1.24.3--1'
'dockerGo': 'adguard/go-builder:1.24.4--1'

View File

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