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

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

bamboo-specs/release.yaml

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

bamboo-specs/snapcraft.yaml

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

bamboo-specs/test.yaml

@@ -8,7 +8,7 @@
     'dockerGo': 'adguard/golang-ubuntu:6.7'
 
 'stages':
-- 'Tests':
+  - 'Tests':
         'manual': false
         'final': false
         'jobs':
@@ -52,7 +52,7 @@
     'link-to-jira': true
 
 'notifications':
-- 'events':
+  - 'events':
       - 'plan-status-changed'
     'recipients':
       - 'webhook':