From df160170ca830630b53dc3b797d96539f572713a Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sat, 28 Nov 2020 11:47:26 +0100 Subject: [PATCH 1/2] Run test on sdist --- .gitlab-ci.yml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2adbfc76..dc82c2e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,24 +113,12 @@ ubuntu_lts_ppa: ubuntu_xenial_pip: image: ubuntu:xenial <<: *apt-template - only: - - master@fdroid/fdroidserver script: - apt-get install git default-jdk-headless python3-pip python3-venv rsync zipalign libarchive13 - rm -rf env - pyvenv env - . env/bin/activate - $pip install --upgrade babel pip setuptools - - $pip install -e . - - ./setup.py compile_catalog - - ./tests/run-tests - -pip_install: - image: archlinux/base - only: - - master@fdroid/fdroidserver - script: - - pacman --sync --sysupgrade --refresh --noconfirm git grep python-pip python-virtualenv tar # setup venv to act as release build machine - python -m venv sdist-env - . sdist-env/bin/activate @@ -138,8 +126,16 @@ pip_install: - deactivate - tar tzf dist/fdroidserver-*.tar.gz | grep locale/de/LC_MESSAGES/fdroidserver.mo # back to bare machine to act as user's install machine - - pip install dist/fdroidserver-*.tar.gz + - $pip install --upgrade pip setuptools + - $pip install dist/fdroidserver-*.tar.gz - test -e /usr/share/locale/de/LC_MESSAGES/fdroidserver.mo + - ./tests/run-tests + +pip_install: + image: archlinux/base + script: + - pacman --sync --sysupgrade --refresh --noconfirm git grep python-pip python-virtualenv tar + - pip install -e . - fdroid - fdroid readmeta - fdroid update --help From 4b2e32389945849e85fc49b8bec5973fd3dc3090 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sat, 28 Nov 2020 11:57:23 +0100 Subject: [PATCH 2/2] Install more test files --- MANIFEST.in | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index e8ded55f..4a6a5671 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -543,6 +543,7 @@ include tests/dummy-keystore.jks include tests/dump_internal_metadata_format.py include tests/exception.TestCase include tests/extra/manual-vmtools-test.py +include tests/funding-usernames.yaml include tests/getsig/getsig.java include tests/getsig/make.sh include tests/getsig/run.sh @@ -550,6 +551,7 @@ include tests/gnupghome/pubring.gpg include tests/gnupghome/random_seed include tests/gnupghome/secring.gpg include tests/gnupghome/trustdb.gpg +include tests/gradle-maven-blocks.yaml include tests/import_proxy.py include tests/import.TestCase include tests/index.TestCase @@ -605,6 +607,7 @@ include tests/metadata/souch.smsbypass.yml include tests/metadata.TestCase include tests/minimal_targetsdk_30_unsigned.apk include tests/no_targetsdk_minsdk1_unsigned.apk +include tests/no_targetsdk_minsdk30_unsigned.apk include tests/openssl-version-check-test.py include tests/org.bitbucket.tickytacky.mirrormirror_1.apk include tests/org.bitbucket.tickytacky.mirrormirror_2.apk @@ -676,7 +679,34 @@ include tests/signindex/guardianproject-v1.jar include tests/signindex/testy.jar include tests/signindex/unsigned.jar include tests/source-files/at.bitfire.davdroid/build.gradle -include tests/source-files/cn.wildfirechat.chat +include tests/source-files/cn.wildfirechat.chat/avenginekit/build.gradle +include tests/source-files/cn.wildfirechat.chat/build.gradle +include tests/source-files/cn.wildfirechat.chat/chat/build.gradle +include tests/source-files/cn.wildfirechat.chat/client/build.gradle +include tests/source-files/cn.wildfirechat.chat/client/src/main/AndroidManifest.xml +include tests/source-files/cn.wildfirechat.chat/emojilibrary/build.gradle +include tests/source-files/cn.wildfirechat.chat/gradle/build_libraries.gradle +include tests/source-files/cn.wildfirechat.chat/imagepicker/build.gradle +include tests/source-files/cn.wildfirechat.chat/mars-core-release/build.gradle +include tests/source-files/cn.wildfirechat.chat/push/build.gradle +include tests/source-files/cn.wildfirechat.chat/settings.gradle +include tests/source-files/com.anpmech.launcher/app/build.gradle +include tests/source-files/com.anpmech.launcher/app/src/main/AndroidManifest.xml +include tests/source-files/com.anpmech.launcher/build.gradle +include tests/source-files/com.anpmech.launcher/settings.gradle +include tests/source-files/com.integreight.onesheeld/build.gradle +include tests/source-files/com.integreight.onesheeld/gradle/wrapper/gradle-wrapper.properties +include tests/source-files/com.integreight.onesheeld/localeapi/build.gradle +include tests/source-files/com.integreight.onesheeld/localeapi/src/main/AndroidManifest.xml +include tests/source-files/com.integreight.onesheeld/oneSheeld/build.gradle +include tests/source-files/com.integreight.onesheeld/oneSheeld/src/main/AndroidManifest.xml +include tests/source-files/com.integreight.onesheeld/pagerIndicator/build.gradle +include tests/source-files/com.integreight.onesheeld/pagerIndicator/src/main/AndroidManifest.xml +include tests/source-files/com.integreight.onesheeld/pullToRefreshlibrary/build.gradle +include tests/source-files/com.integreight.onesheeld/pullToRefreshlibrary/src/main/AndroidManifest.xml +include tests/source-files/com.integreight.onesheeld/quickReturnHeader/build.gradle +include tests/source-files/com.integreight.onesheeld/quickReturnHeader/src/main/AndroidManifest.xml +include tests/source-files/com.integreight.onesheeld/settings.gradle include tests/source-files/com.kunzisoft.testcase/build.gradle include tests/source-files/com.nextcloud.client/build.gradle include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/full_description.txt @@ -701,11 +731,65 @@ include tests/source-files/firebase-whitelisted/app/build.gradle include tests/source-files/firebase-whitelisted/build.gradle include tests/source-files/open-keychain/open-keychain/build.gradle include tests/source-files/open-keychain/open-keychain/OpenKeychain/build.gradle +include tests/source-files/org.mozilla.rocket/app/build.gradle +include tests/source-files/org.tasks/app/build.gradle.kts +include tests/source-files/org.tasks/build.gradle +include tests/source-files/org.tasks/build.gradle.kts +include tests/source-files/org.tasks/buildSrc/build.gradle.kts +include tests/source-files/org.tasks/settings.gradle.kts include tests/source-files/osmandapp/osmand/build.gradle +include tests/source-files/se.manyver/android/app/build.gradle +include tests/source-files/se.manyver/android/build.gradle +include tests/source-files/se.manyver/android/gradle.properties +include tests/source-files/se.manyver/android/gradle/wrapper/gradle-wrapper.properties +include tests/source-files/se.manyver/android/settings.gradle +include tests/source-files/se.manyver/app.json +include tests/source-files/se.manyver/index.android.js +include tests/source-files/se.manyver/package.json +include tests/source-files/se.manyver/react-native.config.js +include tests/source-files/ut.ewh.audiometrytest/app/build.gradle +include tests/source-files/ut.ewh.audiometrytest/app/src/main/AndroidManifest.xml +include tests/source-files/ut.ewh.audiometrytest/build.gradle +include tests/source-files/ut.ewh.audiometrytest/settings.gradle include tests/source-files/Zillode/syncthing-silk/build.gradle include tests/SpeedoMeterApp.main_1.apk include tests/stats/known_apks.txt include tests/testcommon.py +include tests/triple-t-2/build/org.piwigo.android/app/build.gradle +include tests/triple-t-2/build/org.piwigo.android/app/.gitignore +include tests/triple-t-2/build/org.piwigo.android/app/src/debug/res/values/constants.xml +include tests/triple-t-2/build/org.piwigo.android/app/src/debug/res/values/strings.xml +include tests/triple-t-2/build/org.piwigo.android/app/src/main/java/org/piwigo/PiwigoApplication.java +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/contact-email.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/contact-website.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/default-language.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/de-DE/full-description.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/de-DE/short-description.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/de-DE/title.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/en-US/full-description.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/en-US/graphics/feature-graphic/piwigo-full.png +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/en-US/graphics/icon/piwigo-icon.png +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/en-US/graphics/phone-screenshots/01_Login.jpg +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/en-US/graphics/phone-screenshots/02_Albums.jpg +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/en-US/graphics/phone-screenshots/03_Photos.jpg +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/en-US/graphics/phone-screenshots/04_Albums_horizontal.jpg +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/en-US/graphics/phone-screenshots/05_Menu.jpg +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/en-US/graphics/tablet-screenshots/01_Login.png +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/en-US/short-description.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/en-US/title.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/fr-FR/full-description.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/fr-FR/short-description.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/fr-FR/title.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/kn-IN/full-description.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/kn-IN/short-description.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/listings/kn-IN/title.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/release-notes/de-DE/default.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/release-notes/en-US/default.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/release-notes/fr-FR/default.txt +include tests/triple-t-2/build/org.piwigo.android/app/src/main/play/release-notes/kn-IN/default.txt +include tests/triple-t-2/build/org.piwigo.android/build.gradle +include tests/triple-t-2/build/org.piwigo.android/settings.gradle +include tests/triple-t-2/metadata/org.piwigo.android.yml include tests/update.TestCase include tests/urzip.apk include tests/urzip-badcert.apk @@ -716,3 +800,7 @@ include tests/v2.only.sig_2.apk include tests/valid-package-names/random-package-names include tests/valid-package-names/RandomPackageNames.java include tests/valid-package-names/test.py +include tests/Virgin-islands-british_centralamerica_2.obf.zip +include tests/xref/metadata/aarddict.android.yml +include tests/xref/metadata/org.coolreader.yml +include tests/xref/metadata/org.geometerplus.zlibrary.ui.android.yml