summaryrefslogtreecommitdiffstats
path: root/vagrant/provision
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-05-15 08:55:35 +0000
committerintrigeri <intrigeri@boum.org>2015-05-15 08:55:35 +0000
commit8eb7e7c9815040a3cb6887f8ee4a806323f98995 (patch)
tree34736932cf87db3cbc08e36b4536bf620ae9b2e7 /vagrant/provision
parentd5ce31a74fed2bb1af8d1f4b2b007164d324d735 (diff)
Remove files that are not under version control when building in Jenkins.
Jenkins is keeping per-build workspaces around, as shown by errors seen when it merges the base branch into the to-be-built branch: "The following untracked working tree files would be overwritten by merge". That's probably a useful optimization, except it breaks the build e.g. when new translatable files have been introduced without the corresponding PO files at some point. Will-fix: #9406
Diffstat (limited to 'vagrant/provision')
-rwxr-xr-xvagrant/provision/assets/build-tails4
1 files changed, 4 insertions, 0 deletions
diff --git a/vagrant/provision/assets/build-tails b/vagrant/provision/assets/build-tails
index d84d4b9..7cf2df3 100755
--- a/vagrant/provision/assets/build-tails
+++ b/vagrant/provision/assets/build-tails
@@ -82,6 +82,10 @@ cd "$WORKSPACE"
git checkout --force "$REV"
git reset --hard "$COMMIT"
+if [ -n "$JENKINS_URL" ]; then
+ git clean --force -d -x
+fi
+
install -m 0755 -d "$ARTIFACTS_DIR"
if [ "$TAILS_CLEAN_BUILD" ]; then