chiark / gitweb /
relan [Mon, 27 Nov 2017 13:32:41 +0000 (16:32 +0300)]
tests: fix pycodestyle lookup
Pycodestyle is available as /usr/bin/pycodestyle-3 on Fedora.
Hans-Christoph Steiner [Mon, 20 Nov 2017 08:36:07 +0000 (08:36 +0000)]
Merge branch 'gradle-platform-install' into 'master'
Allow Gradle to install new platforms
See merge request fdroid/fdroidserver!373
Hans-Christoph Steiner [Mon, 20 Nov 2017 08:30:37 +0000 (08:30 +0000)]
Merge branch 'remove-ubuntu-trusty-paramiko-hack' into 'master'
buildserver: remove special sshd setup for Ubuntu 14.04
See merge request fdroid/fdroidserver!374
relan [Fri, 17 Nov 2017 18:15:18 +0000 (21:15 +0300)]
buildserver: remove special sshd setup for Ubuntu 14.04
Now that fdroidserver requires Python 3, there's no need to tune sshd for
an old version of Paramiko because Ubuntu 14.04 does not have
python3-paramiko package in its repositories:
https://packages.ubuntu.com/search?keywords=python3-paramiko
We can safely assume that Ubuntu 14.04 users have installed a more recent
version of Paramiko from PIP.
relan [Tue, 14 Nov 2017 09:38:48 +0000 (12:38 +0300)]
buildserver: add new android-sdk-license hash
The old hash does not work anymore, at least for platform-27. Where this
new one comes from:
1. Download command line tools from
https://developer.android.com/studio/index.html#command-tools
2. Unzip the package
3. Run ./tools/bin/sdkmanager --licenses
4. Read and accept licenses
5. Find the hash in ./licenses/android-sdk-license
Marcus [Tue, 14 Nov 2017 12:27:00 +0000 (12:27 +0000)]
Merge branch 'gradle-4.3.1' into 'master'
makebuildserver: add Gradle 4.3.1
See merge request fdroid/fdroidserver!372
relan [Tue, 14 Nov 2017 09:29:21 +0000 (12:29 +0300)]
buildserver: allow gradle/sdkmanager to install new platforms
Google releases new API SDKs quite rarely (about 2 times a year), but when
they do this, many apps quickly start using it. Allow downloading new API
SDKs to avoid waiting for the next buildserver rebuild.
relan [Tue, 14 Nov 2017 07:36:12 +0000 (10:36 +0300)]
makebuildserver: add Gradle 4.3.1
Marcus [Tue, 14 Nov 2017 01:38:19 +0000 (01:38 +0000)]
Merge branch 'master' into 'master'
Changed setup.py +x for easy invocation
Closes #410
See merge request fdroid/fdroidserver!371
Benji Wiebe [Tue, 14 Nov 2017 01:09:51 +0000 (19:09 -0600)]
Changed setup.py +x for easy invocation
Marcus [Sun, 12 Nov 2017 17:18:22 +0000 (17:18 +0000)]
Merge branch 'build-tools_r26.0.3' into 'master'
makebuildserver: add build-tools_r26.0.3
See merge request fdroid/fdroidserver!369
relan [Sun, 12 Nov 2017 07:48:00 +0000 (10:48 +0300)]
makebuildserver: add build-tools_r26.0.3
relan [Sun, 12 Nov 2017 07:44:22 +0000 (07:44 +0000)]
Merge branch 'master' into 'master'
makebuildserver: add build-tools_r27.0.1
See merge request fdroid/fdroidserver!368
Hans-Christoph Steiner [Fri, 10 Nov 2017 21:08:31 +0000 (22:08 +0100)]
jenkins: some reliability fixes to the test scripts
Sergey Eremin [Fri, 10 Nov 2017 15:38:58 +0000 (18:38 +0300)]
makebuildserver: add build-tools_r27.0.1
Hans-Christoph Steiner [Fri, 10 Nov 2017 08:29:50 +0000 (09:29 +0100)]
jenkins-test: ./run-tests won't work with only unsigned APKs
Hans-Christoph Steiner [Thu, 9 Nov 2017 14:02:10 +0000 (15:02 +0100)]
README: add new jenkins.debian.net test
Hans-Christoph Steiner [Thu, 9 Nov 2017 13:07:28 +0000 (14:07 +0100)]
tests: only test `fdroid build` if the right build-tools is installed
Hans-Christoph Steiner [Thu, 9 Nov 2017 12:11:31 +0000 (13:11 +0100)]
tests: fix `fdroid build` test with Debian gradle
Hans-Christoph Steiner [Wed, 8 Nov 2017 12:51:03 +0000 (13:51 +0100)]
fix tests to work when only Debian Android SDK is installed
jenkins.debian.net only had `apt install android-sdk`, it does not have any
of Google's packages installed.
Hans-Christoph Steiner [Wed, 8 Nov 2017 12:50:08 +0000 (13:50 +0100)]
jenkins-test: tame debug output to keep logs at a reasonable length
Hans-Christoph Steiner [Wed, 8 Nov 2017 12:35:35 +0000 (13:35 +0100)]
update: improve help strings
Hans-Christoph Steiner [Wed, 8 Nov 2017 12:14:44 +0000 (13:14 +0100)]
jenkins-test: ./run-tests needs ANDROID_HOME
Hans-Christoph Steiner [Wed, 8 Nov 2017 11:39:59 +0000 (12:39 +0100)]
hooks: add new jenkins scripts to syntax checker
Hans-Christoph Steiner [Wed, 8 Nov 2017 11:03:24 +0000 (12:03 +0100)]
jenkins: make test script executable
Hans-Christoph Steiner [Wed, 8 Nov 2017 08:40:10 +0000 (09:40 +0100)]
jenkins: rename scripts based on jenkins.debian.net names
Make things self-documenting by reusing the exact same names everywhere.
Hans-Christoph Steiner [Wed, 8 Nov 2017 08:38:02 +0000 (09:38 +0100)]
jenkins: move tests to separate job
The setup and build_all jobs take a very long time to run, so its really
annoying when they are marked as failed just because one small thing in the
test suite failed. So move the test suite to its own job that can be run
more frequently.
Hans-Christoph Steiner [Wed, 1 Nov 2017 18:47:28 +0000 (19:47 +0100)]
README: add Weblate badge for translation status
Hans-Christoph Steiner [Tue, 7 Nov 2017 15:24:39 +0000 (16:24 +0100)]
jenkins-build-makebuildserver: bump cpus to 2 and memory to 6144
profitbricks-build7-amd64 has 8 gigs of RAM and 2 cores, so might as well
use them!
Hans-Christoph Steiner [Tue, 7 Nov 2017 14:53:59 +0000 (15:53 +0100)]
jenkins-build: clean / fix paths to buildserver base box setup
[skip ci]
Marcus [Sun, 5 Nov 2017 10:10:59 +0000 (10:10 +0000)]
Merge branch 'build-tools_r27' into 'master'
makebuildserver: add build-tools_r27
See merge request fdroid/fdroidserver!367
relan [Sun, 5 Nov 2017 07:59:01 +0000 (10:59 +0300)]
makebuildserver: add build-tools_r27
Hans-Christoph Steiner [Fri, 3 Nov 2017 13:16:13 +0000 (13:16 +0000)]
Merge branch 'vcs-info' into 'master'
build: raise VCS client version logging level
See merge request fdroid/fdroidserver!366
Hans-Christoph Steiner [Fri, 3 Nov 2017 13:15:11 +0000 (13:15 +0000)]
Merge branch 'gradle-4.3' into 'master'
makebuildserver: add Gradle 4.3
See merge request fdroid/fdroidserver!365
Hans-Christoph Steiner [Fri, 3 Nov 2017 13:14:16 +0000 (13:14 +0000)]
Merge branch 'platform-27_r01' into 'master'
makebuildserver: add platform-27_r01
See merge request fdroid/fdroidserver!364
relan [Thu, 2 Nov 2017 05:47:48 +0000 (08:47 +0300)]
build: raise VCS client version logging level
Debug logging is not saved in buildserver logs. Also move this line into
build.py's main() to avoid duplication: common.setup_vcs(app) may be
called from parse_metadata() too.
relan [Tue, 31 Oct 2017 14:19:57 +0000 (17:19 +0300)]
makebuildserver: add Gradle 4.3
relan [Tue, 31 Oct 2017 14:15:06 +0000 (17:15 +0300)]
makebuildserver: add platform-27_r01
Add Android 8.1.0 SDK platform.
Hans-Christoph Steiner [Mon, 30 Oct 2017 14:35:47 +0000 (15:35 +0100)]
README: better build status layout
Hans-Christoph Steiner [Mon, 30 Oct 2017 14:23:24 +0000 (15:23 +0100)]
add HTML Anchor Name for linking straight to build status badges
Hans-Christoph Steiner [Mon, 30 Oct 2017 09:27:05 +0000 (10:27 +0100)]
README: add status badges for jenkins.debian.net builds
[skip ci]
Hans-Christoph Steiner [Fri, 27 Oct 2017 19:51:13 +0000 (19:51 +0000)]
Merge branch 'add-ulimit-debugging-to-jenkins-build-scirpt' into 'master'
add ulimit debugging to jenkins build script
See merge request fdroid/fdroidserver!363
Michael Pöhn [Fri, 27 Oct 2017 19:21:56 +0000 (21:21 +0200)]
add ulimit debugging to jenkins build script
Hans-Christoph Steiner [Fri, 27 Oct 2017 07:14:15 +0000 (09:14 +0200)]
sort Anti-Features before writing them to the wiki
This avoids silly updates to the wiki where the sort order of the Anti-
Features is the only change:
−{{AntiFeature|KnownVuln}}
{{AntiFeature|DisabledAlgorithm}}
+{{AntiFeature|KnownVuln}}
https://f-droid.org/wiki/index.php?title=info.guardianproject.browser&curid=517&diff=189655&oldid=188037
Hans-Christoph Steiner [Fri, 27 Oct 2017 07:11:50 +0000 (07:11 +0000)]
Merge branch 'more-1.0-polishing' into 'master'
More 1.0 polishing
Closes #402
See merge request fdroid/fdroidserver!362
Ciaran Gultnieks [Tue, 24 Oct 2017 20:11:13 +0000 (22:11 +0200)]
update bombs out when no icons (closes #402)
Hans-Christoph Steiner [Tue, 24 Oct 2017 14:47:53 +0000 (16:47 +0200)]
metadata: make all strings translatable
Hans-Christoph Steiner [Thu, 19 Oct 2017 19:03:39 +0000 (21:03 +0200)]
update: make all strings translatable
Hans-Christoph Steiner [Tue, 24 Oct 2017 14:48:42 +0000 (16:48 +0200)]
make _ always be the gettext function, nothing else
This avoids hard bugs where the _() function gets overidden by a str or
something else.
Hans-Christoph Steiner [Fri, 20 Oct 2017 20:07:28 +0000 (22:07 +0200)]
preserve metadata when copying APK signatures
Since this code was not setting the "create system" and "compress type",
Python uses it's defaults. Those will be different than what the Android
tools produces if this is run on UNIX. The Android tools uses the bare
bones "Windows" ZIP format, e.g. no permissions, etc.
For example:
https://verification.f-droid.org/eu.siacs.conversations_234.apk.diffoscope.html
Hans-Christoph Steiner [Fri, 20 Oct 2017 09:51:59 +0000 (11:51 +0200)]
tests: pre-set failfast as reminder of a handy time saver
Hans-Christoph Steiner [Fri, 20 Oct 2017 09:35:48 +0000 (11:35 +0200)]
choose the most recent available version of Java
This came about testing on OSX, where there are often multiple versions of
the JDK installed. This was choosing the oldest version. It should
choose the most recent version.
Hans-Christoph Steiner [Fri, 20 Oct 2017 06:59:56 +0000 (08:59 +0200)]
travis-ci: only run one round of the test suite on OSX
The OSX tests seem to run slower, they often timeout. So only run
the test suite with the installed version of fdroid, instead of the
three rounds that ./complete-ci-tests does.
Hans-Christoph Steiner [Wed, 25 Oct 2017 20:39:31 +0000 (22:39 +0200)]
Revert "scanner: promote jar and aar files present in the repo to errors"
This reverts commit
5f5d3ea896183260258f653f971c01896ec20ddf.
These new scanner rules for JARs causes most builds on fdroiddata to
break. For example, at least the past 20 releases of
org.fdroid.fdroid. fdroiddata needs to be cleaned up and prepared for
this before we can include
5f5d3ea896183260258f653f971c01896ec20ddf
I'm running fdroid scanner on the whole archive now, I'll post the log
to an issue once its done. Ignoring test files would eliminate some
of these build failures, at least for most org.fdroid.fdroid builds.
refs #!325
Marcus [Wed, 25 Oct 2017 12:41:25 +0000 (12:41 +0000)]
Merge branch 'makebuildserver/default_memory' into 'master'
makebuildserver: change mem default 4 GB
See merge request fdroid/fdroidserver!358
Marcus Hoffmann [Fri, 20 Oct 2017 13:20:51 +0000 (15:20 +0200)]
makebuildserver: change mem default 2 GB
1 GB is not enough for a modern android toolchain, so we change it to
something actually usable.
Hans-Christoph Steiner [Tue, 24 Oct 2017 13:40:53 +0000 (13:40 +0000)]
Merge branch 'patch-1' into 'master'
HTTP, HTTPS
See merge request fdroid/fdroidserver!360
Marcus Hoffmann [Tue, 24 Oct 2017 13:19:38 +0000 (15:19 +0200)]
common: check file existence before opening manifest
This fixes a problem when there is a broken symlink with the name
AndroidManifest.xml which will then lead to a crash when trying to open
it for trying to remove the debuggable flag.
Hans-Christoph Steiner [Mon, 23 Oct 2017 10:27:22 +0000 (10:27 +0000)]
Merge branch 'deploy-localization-support' into 'master'
Deploy localization support
See merge request fdroid/fdroidserver!356
Allan Nordhøy [Sun, 22 Oct 2017 06:43:18 +0000 (06:43 +0000)]
HTTP, HTTPS
Hans-Christoph Steiner [Fri, 20 Oct 2017 19:54:50 +0000 (19:54 +0000)]
Merge branch 'remove_basebox_ref' into 'master'
makebuildserver: remove reference to f-droid.org/jessie64.box
See merge request fdroid/fdroidserver!357
Marcus Hoffmann [Fri, 20 Oct 2017 02:38:39 +0000 (04:38 +0200)]
makebuildserver: remove reference to f-droid.org/jessie64.box
Also improve error message when the initial vagrant up fails, this is
most likely due to the missing jessie64.box file.
Hans-Christoph Steiner [Thu, 19 Oct 2017 20:48:38 +0000 (22:48 +0200)]
fix egg-link and easy_install support for Python3
Wow, this is hacky and weird, but its been there for a long time. I
don't know if its even relevant anymore, but is isolated so it
shouldn't hurt anything. Plus there is a test for it in
tests/complete-ci-tests, so it seems worth fixing.
Hans-Christoph Steiner [Thu, 19 Oct 2017 20:36:19 +0000 (22:36 +0200)]
fix finding translation files when installed
Hans-Christoph Steiner [Thu, 19 Oct 2017 20:13:52 +0000 (22:13 +0200)]
add some context to some strings that are confusing to translators
Hans-Christoph Steiner [Thu, 19 Oct 2017 19:07:50 +0000 (21:07 +0200)]
standardize on "build-tools" as the name of that Android SDK component
Hans-Christoph Steiner [Thu, 19 Oct 2017 16:02:00 +0000 (18:02 +0200)]
update localization source files with `make -C locale`
* `make -C locale` updates all the sources
* `make -C locale compile` can compile the binaries, but the preferred way
is `python3 setup.py compile_catalog`.
Hans-Christoph Steiner [Thu, 19 Oct 2017 16:00:04 +0000 (18:00 +0200)]
use Babel to compile localizations and include in source tarball
python3-babel was also included in the gitlab-ci docker image:
https://gitlab.com/fdroid/ci-images-server/commit/
ffc08dbc1daabfda725de41b712497708213b00e
Hans-Christoph Steiner [Thu, 19 Oct 2017 15:35:29 +0000 (17:35 +0200)]
include in source tarball: be de es es_AR fr nb pt_BR tr uk zh_Hans zh_Hant
The way to officially include a new language in the source tarball is to
add it to the MANIFEST.in. Otherwise, it will not be included in the
source tarball, and therefore won't be installed when using apt, pip, etc.
Hans-Christoph Steiner [Thu, 19 Oct 2017 18:52:15 +0000 (20:52 +0200)]
update: make strings translatable
Hans-Christoph Steiner [Thu, 19 Oct 2017 14:41:47 +0000 (16:41 +0200)]
include README.rst in official release source tarball
README.rst is still the standard for Python libs.
Hans-Christoph Steiner [Thu, 19 Oct 2017 18:37:39 +0000 (20:37 +0200)]
FDroidException handle Exceptions that return things other than str
This is related to
a4c4a16ed9a600b09ff7b62d78eaceb377cf3a9c
Hans-Christoph Steiner [Wed, 18 Oct 2017 12:58:07 +0000 (14:58 +0200)]
tests: make `pip3 install` quieter for shorter CI logs
Hans-Christoph Steiner [Wed, 18 Oct 2017 11:40:32 +0000 (13:40 +0200)]
travis-ci: get OSX tests running again...
Java9 is starting to roll out on some of the Travis CI machines, but
the Android SDK does not yet work on Java9, it throws:
java.lang.NoClassDefFoundError: javax/xml/bind/annotation/XmlSchema
Hans-Christoph Steiner [Wed, 18 Oct 2017 13:11:24 +0000 (13:11 +0000)]
Merge branch '391-fdroid-publish-unknown-execption' into 'master'
better error message in publish when repo_key is not set
Closes #391
See merge request fdroid/fdroidserver!352
Michael Pöhn [Mon, 16 Oct 2017 16:11:57 +0000 (18:11 +0200)]
better error message in publish when repo_key is not set
Hans-Christoph Steiner [Tue, 17 Oct 2017 15:41:20 +0000 (17:41 +0200)]
`make update` to update all translation files from source code
Hans-Christoph Steiner [Tue, 17 Oct 2017 16:24:26 +0000 (16:24 +0000)]
Merge branch 'weblate' into 'master'
Weblate
See merge request fdroid/fdroidserver!354
Hans-Christoph Steiner [Tue, 17 Oct 2017 16:24:25 +0000 (16:24 +0000)]
Weblate
Hans-Christoph Steiner [Tue, 17 Oct 2017 13:53:01 +0000 (15:53 +0200)]
jenkins-build-makebuildserver: use current version for test build
Torsten Grote [Tue, 17 Oct 2017 14:19:47 +0000 (14:19 +0000)]
Merge branch '1.0-fixes' into 'master'
1.0 fixes
Closes #357
See merge request fdroid/fdroidserver!353
Hans-Christoph Steiner [Fri, 13 Oct 2017 12:50:22 +0000 (14:50 +0200)]
include all argparse strings in translation template
The Python argparse library has its own strings, which are translatable
via gettext. This gets those sources strings from the library, and
includes them in this project. Since gettext is invoked and configured
in fdroidserver, fdroidserver needs to handle the translations for the
libraries it uses.
Hans-Christoph Steiner [Fri, 13 Oct 2017 12:55:07 +0000 (14:55 +0200)]
update translation template and add file context for each string
The file context lets the translators know which command the string applies
to. It does not have line numbers, since those are less useful, while
causing lots of merge conflicts.
Hans-Christoph Steiner [Tue, 10 Oct 2017 10:41:49 +0000 (12:41 +0200)]
update: support Fastlane's official location for screenshots
fastlane/android/metadata/locale/images/*Screenshots
https://github.com/fastlane/fastlane/blob/2.61.0/screengrab/lib/screengrab/runner.rb#L324
closes #357
Hans-Christoph Steiner [Tue, 10 Oct 2017 10:29:04 +0000 (12:29 +0200)]
update: fix detection of Triple-T screenshots
* https://github.com/westnordost/StreetComplete/issues/489
* https://forum.f-droid.org/t/screenshots-dont-show-up-in-client-using-gradle-play-publisher/881/2
#357
Hans-Christoph Steiner [Fri, 29 Sep 2017 15:50:23 +0000 (17:50 +0200)]
server: automatically create S3 bucket when using s3cmd
Hans-Christoph Steiner [Fri, 29 Sep 2017 15:49:48 +0000 (17:49 +0200)]
server: move strings to be gettext translatable
Hans-Christoph Steiner [Wed, 27 Sep 2017 15:35:51 +0000 (17:35 +0200)]
handle exceptions that send a tuple for the error message
Running `fdroid verify` I was seeing FDroidExceptions from verify.py:98
that had a tuple rather than a string.
Traceback (most recent call last):
File "/home/hans/code/fdroid/server/fdroid", line 152, in <module>
main()
File "/home/hans/code/fdroid/server/fdroid", line 128, in main
mod.main()
File "/home/hans/code/fdroid/server/fdroidserver/verify.py", line 98, in main
logging.info("...NOT verified - {0}".format(e))
File "/home/hans/code/fdroid/server/fdroidserver/exception.py", line 22, in __str__
ret += "\n==== detail begin ====\n%s\n==== detail end ====" % ''.join(self.detail).strip()
TypeError: sequence item 1: expected str instance, HTTPError found
Hans-Christoph Steiner [Thu, 12 Oct 2017 11:46:59 +0000 (11:46 +0000)]
Merge branch 'error_on_jars' into 'master'
RFC: Error on jars
See merge request fdroid/fdroidserver!325
Hans-Christoph Steiner [Sun, 8 Oct 2017 19:06:09 +0000 (19:06 +0000)]
Merge branch 'gradle-4.2.1' into 'master'
makebuildserver: add Gradle 4.2.1
See merge request fdroid/fdroidserver!351
relan [Sun, 8 Oct 2017 18:10:43 +0000 (21:10 +0300)]
makebuildserver: add Gradle 4.2.1
N.B. Actual address of the distribution server is downloads.gradle.org;
services.gradle.org redirects to it.
Michael Pöhn [Fri, 6 Oct 2017 17:18:10 +0000 (17:18 +0000)]
Merge branch '334-make-index-generation-fully-reproducible' into 'master'
Resolve "make index generation fully reproducible"
Closes #334
See merge request fdroid/fdroidserver!343
Hans-Christoph Steiner [Fri, 6 Oct 2017 09:07:13 +0000 (09:07 +0000)]
Merge branch 'print-vcs-client-version' into 'master'
common: print VCS client version
See merge request fdroid/fdroidserver!349
relan [Fri, 6 Oct 2017 06:37:47 +0000 (09:37 +0300)]
common: print VCS client version
This may help to debug issues with too old VCS clients.
Hans-Christoph Steiner [Wed, 4 Oct 2017 20:13:46 +0000 (20:13 +0000)]
Merge branch 'fix_bare_except' into 'master'
fix bare except to satisfy newer pycodestyle
See merge request fdroid/fdroidserver!348
Hans-Christoph Steiner [Wed, 4 Oct 2017 20:13:33 +0000 (20:13 +0000)]
Merge branch 'build-tools-26-0-2' into 'master'
add build-tools 26.0.2
See merge request fdroid/fdroidserver!347
Marcus Hoffmann [Wed, 4 Oct 2017 17:23:53 +0000 (19:23 +0200)]
fix bare except to satisfy newer pycodestyle
Marcus Hoffmann [Wed, 4 Oct 2017 17:03:41 +0000 (19:03 +0200)]
add build-tools 26.0.2
Marcus Hoffmann [Wed, 4 Oct 2017 16:18:30 +0000 (18:18 +0200)]
import: fix bitbucket import
repo type can be found on main url, not under /src
Hans-Christoph Steiner [Tue, 3 Oct 2017 13:19:47 +0000 (13:19 +0000)]
Merge branch 'fix-dot-gradle-removal' into 'master'
build: fix build/ and .gradle/ removal after cleaning
Closes #384
See merge request fdroid/fdroidserver!346