Commit 0c043dbf authored by intrigeri's avatar intrigeri

Fix reproducibility of builds of topic branches that lag behind their base...

Fix reproducibility of builds of topic branches that lag behind their base branch with the mergebasebranch build option enabled (refs: #14946)

Two otherwise identical merge commits done at different times get different IDs,
and we happen to embed in the ISO the ID of the commit we're building from.
parent 0a484302
......@@ -59,8 +59,9 @@ if [ "${TAILS_MERGE_BASE_BRANCH:-}" = 1 ] && \
echo "Merging base branch origin/${GIT_BASE_BRANCH}"
echo "(at commit ${GIT_BASE_BRANCH_COMMIT})..."
git merge --no-edit "origin/${GIT_BASE_BRANCH}" \
|| fatal "Failed to merge base branch."
faketime -f "${SOURCE_DATE_FAKETIME}" \
git merge --no-edit "origin/${GIT_BASE_BRANCH}" \
|| fatal "Failed to merge base branch."
git submodule update --init
# Adjust BUILD_BASENAME to embed the base branch name and its top commit
......
......@@ -12,6 +12,7 @@
export SOURCE_DATE_EPOCH="$(date --utc --date="$(dpkg-parsechangelog --show-field=Date)" +%s)"
export SOURCE_DATE_YYYYMMDD="$(date --utc --date="$(dpkg-parsechangelog --show-field=Date)" +%Y%m%d)"
export SOURCE_DATE_FAKETIME="$(date --utc --date="$(dpkg-parsechangelog --show-field=Date)" '+%Y-%m-%d %H:%M:%S')"
# Base for the string that will be passed to "lb config --bootappend-live"
# FIXME: see [[bugs/sdmem_on_eject_broken_for_CD]] for explanation why we
......
......@@ -74,6 +74,7 @@ apt-get -y install \
debootstrap \
dpkg-dev \
eatmydata \
faketime \
gettext \
git \
ikiwiki \
......
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