From: Hans-Christoph Steiner Date: Thu, 23 Feb 2017 21:32:08 +0000 (+0100) Subject: build: ensure test is running on git commit that this code works with X-Git-Tag: 0.8~121^2~1 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=388c336e7676ce8ee5b06f147caa72991c43a569;p=fdroidserver.git build: ensure test is running on git commit that this code works with Since https://gitlab.com/fdroid/ci-test-app is a separate git repo, things with incompatible changes could get out of sync. Therefore, this test should specify which git commit is runs against. For example, the .fdroid.yml file is still a moving target. Just now, the keys had the spaces removed as part of this MR. --- diff --git a/tests/run-tests b/tests/run-tests index 09f401c1..8a9b500a 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -144,6 +144,10 @@ $fdroid update echo_header 'run `fdroid build` in fresh git checkout from import.TestCase' cd $WORKSPACE/tests/tmp/importer +git remote update -p +git clean -fdx +# stick with known working commit, in case future commits break things for this code +git reset --hard cecf00c08aec56ae7a5eba444150c4d1ae868814 if [ -d $ANDROID_HOME/platforms/android-23 ]; then echo "build_tools = '`ls -1 $ANDROID_HOME/build-tools/ | sort -n | tail -1`'" > config.py echo "force_build_tools = True" >> config.py