From ec05ee16fe3df3448cc99bf4a40ca440e852f5e5 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Thu, 15 Dec 2022 17:38:01 +0300 Subject: [PATCH] Pull request: skip-snap Merge in DNS/adguard-home from skip-snap to master Squashed commit of the following: commit 3859612645826ccad025ab4ba7e03adac6d09842 Author: Ainar Garipov Date: Thu Dec 15 17:19:48 2022 +0300 all: skip snap upload temporarily; imp issue tmpl --- .github/ISSUE_TEMPLATE/config.yml | 6 +++--- bamboo-specs/release.yaml | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index c80d6d66..d2ca2128 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -7,9 +7,9 @@ 'name': 'AdGuard filters issues' 'url': 'https://link.adtidy.org/forward.html?action=report&app=home&from=github' - 'about': > - Please send requests for addition to the vetted filtering lists to the - Hostlists Registry repository. - 'name': 'AdGuard Hostlists Registry' + Please send requests for new blocked services and vetted filtering lists + to the Hostlists Registry repository + 'name': 'Blocked services and vetted filtering rule lists: AdGuard Hostlists Registry' 'url': 'https://github.com/AdguardTeam/HostlistsRegistry' - 'about': > Please use GitHub Discussions for questions diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index a43dca2b..dc9acae9 100644 --- a/bamboo-specs/release.yaml +++ b/bamboo-specs/release.yaml @@ -239,12 +239,18 @@ ;; 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\ SNAPCRAFT_CHANNEL="$snapchannel"\ SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\ SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\ SNAPCRAFT_UBUNTU_DISCHARGE="${bamboo.snapcraftUbuntuDischargePassword}"\ - ../bamboo-deploy-publisher/deploy.sh adguard-home-snap + ../bamboo-deploy-publisher/deploy.sh adguard-home-snap || : 'final-tasks': - 'clean' 'requirements':