summaryrefslogtreecommitdiffstats
path: root/vagrant/provision
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-05-15 09:00:38 +0000
committerintrigeri <intrigeri@boum.org>2015-05-15 09:04:59 +0000
commitd81c8c335bbb02cf4c67b940741ff5ad15179249 (patch)
tree71de9acd0a55d32f9eeda7317da7473017b507a9 /vagrant/provision
parent8eb7e7c9815040a3cb6887f8ee4a806323f98995 (diff)
Don't modify files in the source tree before having possibly merged the base branch into it.
Previously, when building in Jenkins, we refreshed the wiki (twice) and translations before merging the base branch. As a result, we're seeing build failures with the "Your local changes to the following files would be overwritten by merge" error message. Let's now build the wiki and refresh translations only _after_ having merged the base branch, which makes more sense anyway: we want to include changes from the base branch into the wiki and translations. And while we're at it, let's refresh the wiki only once when building in Jenkins. Note that Vagrant builds will still build the wiki before setting up the ramdisk and running live-build: those builds don't merge the base branch anyway, so they can as well keep the wiki build caching mechanism, which is a nice optimization. Will-fix: #9406
Diffstat (limited to 'vagrant/provision')
-rwxr-xr-xvagrant/provision/assets/build-tails5
1 files changed, 4 insertions, 1 deletions
diff --git a/vagrant/provision/assets/build-tails b/vagrant/provision/assets/build-tails
index 7cf2df3..3e06444 100755
--- a/vagrant/provision/assets/build-tails
+++ b/vagrant/provision/assets/build-tails
@@ -91,7 +91,10 @@ install -m 0755 -d "$ARTIFACTS_DIR"
if [ "$TAILS_CLEAN_BUILD" ]; then
as_root_do lb clean --all
fi
-./build-wiki
+
+if [ -z "$JENKINS_URL" ]; then
+ ./build-wiki
+fi
BUILD_DIR=$(mktemp -d /tmp/tails-build.XXXXXXXX)
if [ "$TAILS_RAM_BUILD" ]; then