Pull request 2339: upd-deps

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

Squashed commit of the following:

commit 40d509625c0099c34e6ff14f69b0ab1535b9c51f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Feb 7 13:19:24 2025 +0300

    all: upd go, deps
This commit is contained in:
Ainar Garipov
2025-02-07 13:49:29 +03:00
parent d3dea0f46c
commit b92a3cfb89
11 changed files with 199 additions and 181 deletions

View File

@@ -8,7 +8,7 @@
'variables':
'channel': 'edge'
'dockerFrontend': 'adguard/home-js-builder:2.0'
'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.0'
'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.0'
'dockerGo': 'adguard/go-builder:1.23.5--1'
'dockerGo': 'adguard/go-builder:1.23.6--1'

View File

@@ -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.5--1'
'dockerGo': 'adguard/go-builder:1.23.6--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.5--1'
'dockerGo': 'adguard/go-builder:1.23.6--1'
'channel': 'candidate'