Pull request: skip-snap

Merge in DNS/adguard-home from skip-snap to master

Squashed commit of the following:

commit 3859612645826ccad025ab4ba7e03adac6d09842
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 15 17:19:48 2022 +0300

    all: skip snap upload temporarily; imp issue tmpl
This commit is contained in:
Ainar Garipov 2022-12-15 17:38:01 +03:00
parent c1b537c14b
commit ec05ee16fe
2 changed files with 10 additions and 4 deletions

View File

@ -7,9 +7,9 @@
'name': 'AdGuard filters issues' 'name': 'AdGuard filters issues'
'url': 'https://link.adtidy.org/forward.html?action=report&app=home&from=github' 'url': 'https://link.adtidy.org/forward.html?action=report&app=home&from=github'
- 'about': > - 'about': >
Please send requests for addition to the vetted filtering lists to the Please send requests for new blocked services and vetted filtering lists
Hostlists Registry repository. to the Hostlists Registry repository
'name': 'AdGuard Hostlists Registry' 'name': 'Blocked services and vetted filtering rule lists: AdGuard Hostlists Registry'
'url': 'https://github.com/AdguardTeam/HostlistsRegistry' 'url': 'https://github.com/AdguardTeam/HostlistsRegistry'
- 'about': > - 'about': >
Please use GitHub Discussions for questions Please use GitHub Discussions for questions

View File

@ -239,12 +239,18 @@
;; ;;
esac esac
# Ignore errors from the Snapstore upload script, because it seems to
# have a lot of issues recently.
#
# TODO(a.garipov): Stop ignoring those errors once they fix the issues.
#
# See https://forum.snapcraft.io/t/unable-to-upload-promote-snaps-to-edge/33120.
env\ env\
SNAPCRAFT_CHANNEL="$snapchannel"\ SNAPCRAFT_CHANNEL="$snapchannel"\
SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\ SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\
SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\ SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\
SNAPCRAFT_UBUNTU_DISCHARGE="${bamboo.snapcraftUbuntuDischargePassword}"\ SNAPCRAFT_UBUNTU_DISCHARGE="${bamboo.snapcraftUbuntuDischargePassword}"\
../bamboo-deploy-publisher/deploy.sh adguard-home-snap ../bamboo-deploy-publisher/deploy.sh adguard-home-snap || :
'final-tasks': 'final-tasks':
- 'clean' - 'clean'
'requirements': 'requirements':