Skip to content
Snippets Groups Projects
Commit 13a2f994 authored by Emmanuel Lepage Vallee's avatar Emmanuel Lepage Vallee Committed by Tristan Matthews
Browse files

build-system: Allow emergency patches to streamline the release process

Refs: #51465

Change-Id: I513996df42d9662e1dae401a2768bc210fe470ae
parent d1a35000
No related branches found
No related tags found
No related merge requests found
......@@ -154,7 +154,17 @@ fi
# If release, checkout the latest tag
if [ ${IS_RELEASE} ]; then
git checkout ${CURRENT_RELEASE_TAG_NAME}
git checkout ${CURRENT_RELEASE_TAG_NAME}
# When we need to apply an emergency patch for the release builds
# This should only be used to temporarily patch packaging tools, not
# daemon/client code (or anything else that build_tarball would grab).
if [ -d /tmp/sflphone_release_patch ]; then
echo "Applying patch(es) to packaging tools..."
git apply /tmp/sflphone_release_patch/*
rm -rf /tmp/sflphone_release_patch
REQUIRE_RESET=1
fi
fi
echo "Retrieve build info"
......@@ -303,6 +313,10 @@ done
# Archive source tarball for Debian maintainer
. ${WORKING_DIR}/build_tarball.sh ${SOFTWARE_VERSION}
# Undo any modifications caused by temporary patches
if [ "$REQUIRE_RESET" == "1" ]; then
git reset --hard
fi
# close file descriptor
exec 3>&-
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment