diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10d08696..61cc21e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,6 @@ test: image: registry.gitlab.com/fdroid/ci-images-base script: - $pip install -e .[test] - # the `fdroid build` test in tests/run-tests needs android-23 - - echo y | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-23" > /dev/null - cd tests - ./complete-ci-tests diff --git a/tests/run-tests b/tests/run-tests index 16d0bdfd..ccf1bd40 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -219,20 +219,6 @@ $fdroid readmeta $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 fea54e1161d5eb9eb1a54e26253ef84d3ab63705 -if [ -d $ANDROID_HOME/platforms/android-23 && -d $ANDROID_HOME/build-tools/23.0.3 ]; then - $fdroid build --verbose org.fdroid.ci.test.app:300 -else - echo 'WARNING: Skipping "fdroid build" test since android-23 is missing!' -fi - #------------------------------------------------------------------------------# echo_header 'copy git import and run "fdroid scanner" on it'