Pull request 1848: fix-snap
Merge in DNS/adguard-home from fix-snap to master Squashed commit of the following: commit 4a12b2709229150e1b896b71b2b0a99249f94fde Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Sat May 20 11:51:25 2023 +0300 bamboo-specs: upd snap script
This commit is contained in:
parent
b72a3d01b8
commit
24b41100c3
|
@ -232,25 +232,24 @@
|
||||||
case "$channel"
|
case "$channel"
|
||||||
in
|
in
|
||||||
('release')
|
('release')
|
||||||
snapchannel='candidate'
|
snapchannel='candidate'
|
||||||
;;
|
;;
|
||||||
('beta')
|
('beta')
|
||||||
snapchannel='beta'
|
snapchannel='beta'
|
||||||
;;
|
;;
|
||||||
('edge')
|
('edge')
|
||||||
snapchannel='edge'
|
snapchannel='edge'
|
||||||
;;
|
;;
|
||||||
(*)
|
(*)
|
||||||
echo "invalid channel '$channel'"
|
echo "invalid channel '$channel'"
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
env\
|
env\
|
||||||
SNAPCRAFT_CHANNEL="$snapchannel"\
|
SNAPCRAFT_CHANNEL="$snapchannel"\
|
||||||
SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\
|
SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\
|
||||||
SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\
|
SNAPCRAFT_STORE_CREDENTIALS="${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':
|
'final-tasks':
|
||||||
- 'clean'
|
- 'clean'
|
||||||
|
@ -280,9 +279,9 @@
|
||||||
|
|
||||||
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
|
if [ "$channel" != 'release' ] && [ "${channel}" != 'beta' ]
|
||||||
then
|
then
|
||||||
echo "don't publish to GitHub Releases for this channel"
|
echo "don't publish to GitHub Releases for this channel"
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd ./dist/
|
cd ./dist/
|
||||||
|
|
Loading…
Reference in New Issue