Commit ebd80aa4 authored by Tails developers's avatar Tails developers
Browse files

Merge remote-tracking branch 'origin/feature/More_uniq_built_iso_name_in_jenkins' into stable

parents 9ba2656a 845adff9
......@@ -71,10 +71,16 @@ export MKSQUASHFS_OPTIONS
# get git branch or tag so we can set the basename appropriately, i.e.:
# * if we build from a tag: tails-$ARCH-$TAG.iso
# * if we build from a branch: tails-$ARCH-$BRANCH-$VERSION-$DATE.iso
# * if Jenkins builds from a branch: tails-$ARCH-$BRANCH-$VERSION-$TIME-$COMMIT.iso
if GIT_REF="$(git symbolic-ref HEAD)"; then
GIT_BRANCH="${GIT_REF#refs/heads/}"
CLEAN_GIT_BRANCH=$(echo "$GIT_BRANCH" | sed 's,/,_,g')
BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_TODAY}"
if [ -n "$JENKINS_URL" ]; then
GIT_SHORT_ID="$(git rev-parse --short HEAD)"
BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_NOW}-${GIT_SHORT_ID}"
else
BUILD_BASENAME="tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${AMNESIA_TODAY}"
fi
else
GIT_CURRENT_COMMIT="$(git rev-parse HEAD)"
if GIT_TAG="$(git describe --tags --exact-match ${GIT_CURRENT_COMMIT})"; then
......
......@@ -24,6 +24,7 @@ if [ ! -x "`which dpkg-parsechangelog`" ]; then
fi
# Compute the current Amnesia's version once for all
AMNESIA_NOW="`date --utc '+%Y%m%dT%H%MZ'`"
AMNESIA_TODAY="`date '+%Y%m%d'`"
AMNESIA_VERSION="`dpkg-parsechangelog | sed -n 's/^Version: //p'`"
AMNESIA_FULL_VERSION="${AMNESIA_VERSION} - ${AMNESIA_TODAY}"
......
......@@ -14,6 +14,7 @@ as_root_do() {
${https_proxy:+https_proxy="$https_proxy"} \
${ftp_proxy:+ftp_proxy="$ftp_proxy"} \
${no_proxy:+no_proxy="$no_proxy"} \
${JENKINS_URL:+JENKINS_URL="$JENKINS_URL"} \
${MKSQUASHFS_OPTIONS:+MKSQUASHFS_OPTIONS="$MKSQUASHFS_OPTIONS"} \
"$@"
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment