Merge in DNS/adguard-home from ADG-9415 to master Squashed commit of the following: commit76bf99499aMerge:29529970a0389515eeAuthor: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 26 18:31:41 2025 +0300 Merge branch 'master' into ADG-9415 commit29529970a3Merge:b49790daf782a1a982Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Feb 24 15:44:38 2025 +0300 Merge branch 'master' into ADG-9415 commitb49790daf8Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 15:30:18 2025 +0300 fix default lease duration value commitcb307472ecAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:35:26 2025 +0300 fix default response status commit115e743e1aAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:32:46 2025 +0300 fix upstream description commit26b0eddacaAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:40:41 2025 +0300 use const for test config file commit58faa7c537Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:31:04 2025 +0300 fix install config commit0a3346d911Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 17 15:25:23 2025 +0300 fix install check config commit17c4c26ea8Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 17:18:20 2025 +0300 fix query log commit14a2685ae3Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 15:52:36 2025 +0300 fix dhcp initial values commite7a8db7afdAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:37:24 2025 +0300 fix encryption form values commit1c8917f7acAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:07:29 2025 +0300 fix blocked services submit commit4dfa536ceaAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 13:50:47 2025 +0300 dns config ip validation commit4fee83fe13Author: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 12 17:49:54 2025 +0300 add playwright warning commit8c2f36e7a6Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 18:36:18 2025 +0300 fix config file name commit83db5f33dcAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 16:16:43 2025 +0300 temp config file commit9080c1620fAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 15:01:46 2025 +0300 update readme commitee1520307fMerge:fd12e33c02fe2d254bAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 14:44:06 2025 +0300 Merge branch 'master' into ADG-9415 commitfd12e33c06Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 10:29:43 2025 +0100 added typecheck on build, fixed eslint commitb3849eebc4Merge:225167a8b9bf3ee128Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 09:43:32 2025 +0100 Merge branch 'ADG-9415' of https://bit.int.agrd.dev/scm/dns/adguard-home into ADG-9415 ... and 94 more commits
239 lines
6.1 KiB
YAML
239 lines
6.1 KiB
YAML
---
|
|
'version': 2
|
|
'plan':
|
|
'project-key': 'AGH'
|
|
'key': 'AHBRTSPECS'
|
|
'name': 'AdGuard Home - Build and run tests'
|
|
'variables':
|
|
'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
|
|
'dockerGo': 'adguard/go-builder:1.23.6--1'
|
|
'channel': 'development'
|
|
|
|
'stages':
|
|
- 'Tests':
|
|
'manual': false
|
|
'final': false
|
|
'jobs':
|
|
- 'Test frontend'
|
|
- 'Test backend'
|
|
|
|
- 'Frontend':
|
|
manual: false
|
|
final: false
|
|
jobs:
|
|
- 'Build frontend'
|
|
|
|
- 'Artifact':
|
|
manual: false
|
|
final: false
|
|
jobs:
|
|
- 'Artifact'
|
|
|
|
- 'E2E':
|
|
manual: false
|
|
final: false
|
|
jobs:
|
|
- 'Test e2e'
|
|
|
|
'Test frontend':
|
|
'docker':
|
|
'image': '${bamboo.dockerFrontend}'
|
|
'volumes':
|
|
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
|
|
'key': 'JSTEST'
|
|
'other':
|
|
'clean-working-dir': true
|
|
'tasks':
|
|
- 'checkout':
|
|
'force-clean-build': true
|
|
- 'script':
|
|
'interpreter': 'SHELL'
|
|
'scripts':
|
|
- |
|
|
#!/bin/sh
|
|
|
|
set -e -f -u -x
|
|
|
|
make VERBOSE=1 js-deps js-typecheck js-lint js-test
|
|
'final-tasks':
|
|
- 'clean'
|
|
'requirements':
|
|
- 'adg-docker': 'true'
|
|
|
|
# TODO(e.burkov): Add the linting stage for markdown docs and shell scripts.
|
|
'Test backend':
|
|
'docker':
|
|
'image': '${bamboo.dockerGo}'
|
|
'volumes':
|
|
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
|
|
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
|
|
'key': 'GOTEST'
|
|
'other':
|
|
'clean-working-dir': true
|
|
'tasks':
|
|
- 'checkout':
|
|
'force-clean-build': true
|
|
- 'script':
|
|
'interpreter': 'SHELL'
|
|
'scripts':
|
|
- |
|
|
#!/bin/sh
|
|
|
|
set -e -f -u -x
|
|
|
|
make\
|
|
GOMAXPROCS=1\
|
|
VERBOSE=1\
|
|
go-deps go-tools go-lint
|
|
|
|
make\
|
|
VERBOSE=1\
|
|
go-test
|
|
'final-tasks':
|
|
- 'clean'
|
|
'requirements':
|
|
- 'adg-docker': 'true'
|
|
|
|
'Build frontend':
|
|
'artifacts':
|
|
- 'name': 'AdGuardHome frontend'
|
|
'pattern': 'build/**'
|
|
'shared': true
|
|
'required': true
|
|
'docker':
|
|
'image': '${bamboo.dockerFrontend}'
|
|
'volumes':
|
|
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
|
|
'key': 'BF'
|
|
'other':
|
|
'clean-working-dir': true
|
|
'tasks':
|
|
- 'checkout':
|
|
'force-clean-build': true
|
|
- 'script':
|
|
'interpreter': 'SHELL'
|
|
'scripts':
|
|
- |-
|
|
#!/bin/sh
|
|
|
|
set -e -f -u -x
|
|
|
|
make\
|
|
VERBOSE=1\
|
|
js-deps js-build
|
|
'requirements':
|
|
- 'adg-docker': 'true'
|
|
|
|
'Artifact':
|
|
'artifact-subscriptions':
|
|
- 'artifact': 'AdGuardHome frontend'
|
|
'artifacts':
|
|
- 'name': 'AdGuardHome_windows_amd64'
|
|
'pattern': 'dist/AdGuardHome_windows_amd64.zip'
|
|
'shared': true
|
|
'required': true
|
|
- 'name': 'AdGuardHome_darwin_amd64'
|
|
'pattern': 'dist/AdGuardHome_darwin_amd64.zip'
|
|
'shared': true
|
|
'required': true
|
|
- 'name': 'AdGuardHome_linux_amd64'
|
|
'pattern': 'dist/AdGuardHome_linux_amd64.tar.gz'
|
|
'shared': true
|
|
'required': true
|
|
'docker':
|
|
'image': '${bamboo.dockerGo}'
|
|
'volumes':
|
|
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
|
|
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
|
|
'key': 'ART'
|
|
'other':
|
|
'clean-working-dir': true
|
|
'tasks':
|
|
- 'checkout':
|
|
'force-clean-build': true
|
|
- 'script':
|
|
'interpreter': 'SHELL'
|
|
'scripts':
|
|
- |-
|
|
#!/bin/sh
|
|
|
|
set -e -f -u -x
|
|
|
|
make\
|
|
ARCH="amd64"\
|
|
CHANNEL=${bamboo.channel}\
|
|
FRONTEND_PREBUILT=1\
|
|
OS="windows darwin linux"\
|
|
PARALLELISM=1\
|
|
SIGN=0\
|
|
VERBOSE=2\
|
|
build-release
|
|
'requirements':
|
|
- 'adg-docker': 'true'
|
|
|
|
'Test e2e':
|
|
'artifact-subscriptions':
|
|
- 'artifact': 'AdGuardHome_linux_amd64'
|
|
- 'artifact': 'AdGuardHome frontend'
|
|
'docker':
|
|
'image': '${bamboo.dockerFrontend}'
|
|
'volumes':
|
|
'${system.YARN_DIR}': '${bamboo.cacheYarn}'
|
|
'key': 'E2ETEST'
|
|
'other':
|
|
'clean-working-dir': true
|
|
'tasks':
|
|
- 'checkout':
|
|
'force-clean-build': true
|
|
- 'script':
|
|
'interpreter': 'SHELL'
|
|
'scripts':
|
|
- |
|
|
#!/bin/sh
|
|
|
|
set -e -f -u -x
|
|
|
|
export CI=true
|
|
|
|
tar -xzf dist/AdGuardHome_linux_amd64.tar.gz -C /tmp
|
|
|
|
mv /tmp/AdGuardHome/AdGuardHome ./AdGuardHome
|
|
|
|
make VERBOSE=1 js-deps js-test-e2e
|
|
'requirements':
|
|
- 'adg-docker': 'true'
|
|
|
|
'branches':
|
|
'create': 'for-pull-request'
|
|
'delete':
|
|
'after-deleted-days': 1
|
|
'after-inactive-days': 5
|
|
'integration':
|
|
'push-on-success': false
|
|
'merge-from': 'AdGuard Home - Build and run tests'
|
|
'link-to-jira': true
|
|
|
|
'notifications':
|
|
- 'events':
|
|
- 'plan-status-changed'
|
|
'recipients':
|
|
- 'webhook':
|
|
'name': 'Build webhook'
|
|
'url': 'http://prod.jirahub.service.eu.consul/v1/webhook/bamboo'
|
|
|
|
'labels': []
|
|
'other':
|
|
'concurrent-build-plugin': 'system-default'
|
|
|
|
'branch-overrides':
|
|
# rc-vX.Y.Z branches are the release candidate branches. They are created
|
|
# from the release branch and are used to build the release candidate
|
|
# images.
|
|
- '^rc-v[0-9]+\.[0-9]+\.[0-9]+':
|
|
# Set the default release channel on the release branch to beta, as we
|
|
# may need to build a few of these.
|
|
'variables':
|
|
'dockerFrontend': 'adguard/home-js-builder:2.1-bullseye'
|
|
'dockerGo': 'adguard/go-builder:1.23.6--1'
|
|
'channel': 'candidate'
|