a/badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*: rename resulting snapfile -- remove version from it

Browse Source
This commit is contained in:
Andrey Meshkov 2020-04-22 17:48:37 +03:00
parent 093617e6bd
commit daf9af9a22
1 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
build_snap.sh
View File

@ -8,13 +8,10 @@ BUILDER_IMAGE="adguard/snapcraft:1.0"
SNAPCRAFT_TMPL="packaging/snap/snapcraft.yaml" SNAPCRAFT_TMPL="packaging/snap/snapcraft.yaml"
SNAP_NAME="adguardhometest" SNAP_NAME="adguardhometest"
LAUNCHPAD_CREDENTIALS_DIR=".local/share/snapcraft/provider/launchpad" LAUNCHPAD_CREDENTIALS_DIR=".local/share/snapcraft/provider/launchpad"
VERSION=`git describe --abbrev=4 --dirty --always --tags`
if [[ "${TRAVIS_BRANCH}" == "master" ]] if [[ -z ${VERSION} ]]; then
then VERSION=`git describe --abbrev=4 --dirty --always --tags`
CHANNEL="edge" echo "VERSION env variable is not set, getting it from git: ${VERSION}"
else
CHANNEL="release"
fi fi
# If bash is interactive, set `-it` parameter for docker run # If bash is interactive, set `-it` parameter for docker run
@ -60,6 +57,18 @@ EOF
####################################### #######################################
function prepare() { function prepare() {
if [ -z ${LAUNCHPAD_KEY} ] || [ -z ${LAUNCHPAD_ACCESS_TOKEN} ] || [ -z ${LAUNCHPAD_ACCESS_SECRET} ]; then
echo "Launchpad oauth tokens are not set, exiting"
usage
exit 1
fi
if [ -z ${SNAPCRAFT_MACAROON} ] || [ -z ${SNAPCRAFT_UBUNTU_DISCHARGE} ] || [ -z ${SNAPCRAFT_EMAIL} ]; then
echo "Snapcraft auth params are not set, exiting"
usage
exit 1
fi
# Launchpad oauth tokens data is necessary to run snapcraft remote-build # Launchpad oauth tokens data is necessary to run snapcraft remote-build
# #
# Here's an instruction on how to generate launchpad OAuth tokens: # Here's an instruction on how to generate launchpad OAuth tokens:
@ -101,6 +110,9 @@ build_snap() {
# remove the credentials - we don't need them anymore # remove the credentials - we don't need them anymore
rm -rf ~/${LAUNCHPAD_CREDENTIALS_DIR} rm -rf ~/${LAUNCHPAD_CREDENTIALS_DIR}
# remove version from the file name
rename_snap_file
# cleanup credentials # cleanup credentials
cleanup cleanup
} }
@ -115,16 +127,33 @@ build_snap_docker() {
${BUILDER_IMAGE} \ ${BUILDER_IMAGE} \
snapcraft remote-build --build-on=${ARCH} --launchpad-accept-public-upload snapcraft remote-build --build-on=${ARCH} --launchpad-accept-public-upload
# remove version from the file name
rename_snap_file
# cleanup credentials # cleanup credentials
cleanup cleanup
} }
rename_snap_file() {
# In order to make working with snaps easier later on
# we remove version from the file name
# Check that the snap file exists
snapFile="${SNAP_NAME}_${VERSION}_${ARCH}.snap"
if [ ! -f ${snapFile} ]; then
echo "Snap file ${snapFile} not found!"
exit 1
fi
mv -f ${snapFile} "${SNAP_NAME}_${ARCH}.snap"
}
publish_snap() { publish_snap() {
# prepare credentials # prepare credentials
prepare prepare
# Check that the snap file exists # Check that the snap file exists
snapFile="${SNAP_NAME}_${VERSION}_${ARCH}.snap" snapFile="${SNAP_NAME}_${ARCH}.snap"
if [ ! -f ${snapFile} ]; then if [ ! -f ${snapFile} ]; then
echo "Snap file ${snapFile} not found!" echo "Snap file ${snapFile} not found!"
exit 1 exit 1
@ -145,7 +174,7 @@ publish_snap_docker() {
prepare prepare
# Check that the snap file exists # Check that the snap file exists
snapFile="${SNAP_NAME}_${VERSION}_${ARCH}.snap" snapFile="${SNAP_NAME}_${ARCH}.snap"
if [ ! -f ${snapFile} ]; then if [ ! -f ${snapFile} ]; then
echo "Snap file ${snapFile} not found!" echo "Snap file ${snapFile} not found!"
exit 1 exit 1