From 81462cd53005da9912da59bcbf4b61044f07c1e6 Mon Sep 17 00:00:00 2001
From: Joseph Henry <joseph.henry@zerotier.com>
Date: Wed, 15 Jun 2022 11:06:16 -0700
Subject: [PATCH] Add snapcraft login step for future CI/CD

---
 make-linux.mk | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/make-linux.mk b/make-linux.mk
index 9f61deb31..145bebe52 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -501,16 +501,10 @@ snap-build-remote: FORCE
 	cd pkg && snapcraft remote-build --build-on=amd64,arm64,s390x,ppc64el,armhf,i386
 
 snap-upload-beta: FORCE
+	snapcraft login --with-file=snapcraft-login-data
 	pushd pkg
 	for SNAPFILE in ./*.snap; do\
-		snapcraft upload --release=beta,edge,candidate $${SNAPFILE};\
-	done
-	popd
-
-snap-upload-stable: FORCE
-	pushd pkg
-	for SNAPFILE in ./*.snap; do\
-		snapcraft upload --release=stable $${SNAPFILE};\
+		snapcraft upload --release=stable,beta,edge,candidate $${SNAPFILE};\
 	done
 	popd