mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2025-03-15 06:59:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Pull request 1885: AG-23334-fix-snap-plan

Browse source 
Merge in DNS/adguard-home from AG-23334-fix-snap-plan to master

Squashed commit of the following:

commit 5d632d1d63c56911e005d0e772e82a509302e948
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 21 17:42:36 2023 +0300

    bamboo-specs: fix snap build; fmt
This commit is contained in:
Ainar Garipov 2023-06-21 17:47:16 +03:00
parent 994906fbd4
commit 123ca87388
3 changed files with 281 additions and 283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bamboo-specs/release.yaml
View file

@ -65,7 +65,7 @@
make js-deps js-build make js-deps js-build
'artifacts': 'artifacts':
- 'name': 'AdGuardHome frontend' - 'name': 'AdGuardHome frontend'
'pattern': 'build*/**' 'pattern': 'build/**'
'shared': true 'shared': true
'required': true 'required': true
'requirements': 'requirements':
@ -237,8 +237,8 @@
- 'adg-docker': 'true' - 'adg-docker': 'true'
'triggers': 'triggers':
# Don't use minute values that end with a zero or a five as these are often used # Don't use minute values that end with a zero or a five as these are often
# in CI and so resources during these minutes can be quite busy. # used in CI and so resources during these minutes can be quite busy.
- 'cron': '0 42 13 ? * MON-FRI *' - 'cron': '0 42 13 ? * MON-FRI *'
'branches': 'branches':
'create': 'manually' 'create': 'manually'
@ -263,8 +263,8 @@
'concurrent-build-plugin': 'system-default' 'concurrent-build-plugin': 'system-default'
'branch-overrides': 'branch-overrides':
# beta-vX.Y branches are the branches into which the commits that are needed to # beta-vX.Y branches are the branches into which the commits that are needed
# release a new patch version are initially cherry-picked. # to release a new patch version are initially cherry-picked.
- '^beta-v[0-9]+\.[0-9]+': - '^beta-v[0-9]+\.[0-9]+':
# Build betas on release branches manually. # Build betas on release branches manually.
'triggers': [] 'triggers': []
@ -273,8 +273,8 @@
'variables': 'variables':
'channel': 'beta' 'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:6.7' 'dockerGo': 'adguard/golang-ubuntu:6.7'
# release-vX.Y.Z branches are the branches from which the actual final release # release-vX.Y.Z branches are the branches from which the actual final
# is built. # release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+': - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
# Disable integration branches for release branches. # Disable integration branches for release branches.
'branch-config': 'branch-config':

2
bamboo-specs/snapcraft.yaml
View file

@ -117,8 +117,6 @@
env\ env\
VERBOSE='1'\ VERBOSE='1'\
sh ./scripts/snap/build.sh sh ./scripts/snap/build.sh
'final-tasks':
- 'clean'
'requirements': 'requirements':
- 'adg-docker': 'true' - 'adg-docker': 'true'