chiark / gitweb /
Daniel Martí [Mon, 4 Jan 2016 16:43:13 +0000 (17:43 +0100)]
Port to python3's configparser
Daniel Martí [Mon, 4 Jan 2016 16:40:21 +0000 (17:40 +0100)]
lint: remove sets usage
Daniel Martí [Mon, 4 Jan 2016 16:32:58 +0000 (17:32 +0100)]
common: update base64 encoding of bytes
Daniel Martí [Mon, 4 Jan 2016 16:37:35 +0000 (17:37 +0100)]
Port all imports to python3
Daniel Martí [Mon, 4 Jan 2016 16:29:40 +0000 (17:29 +0100)]
update: replace ord() with bytearray
Daniel Martí [Mon, 4 Jan 2016 16:28:55 +0000 (17:28 +0100)]
Make pre-commit hook pass after python3 switch
Daniel Martí [Mon, 4 Jan 2016 16:24:57 +0000 (17:24 +0100)]
Run 2to3 on makebuildserver
Mostly just print conversion.
Daniel Martí [Mon, 4 Jan 2016 16:24:40 +0000 (17:24 +0100)]
pre-commit: port to python3
Daniel Martí [Mon, 4 Jan 2016 16:19:28 +0000 (17:19 +0100)]
Remove import workarounds for Python2
Daniel Martí [Mon, 4 Jan 2016 16:17:14 +0000 (17:17 +0100)]
Remove code that worked around python2 unicode
Daniel Martí [Mon, 4 Jan 2016 16:11:39 +0000 (17:11 +0100)]
Get readmeta and rewritemeta running under python3
Daniel Martí [Mon, 4 Jan 2016 16:03:42 +0000 (17:03 +0100)]
Replace basestring with str
Daniel Martí [Mon, 4 Jan 2016 16:02:28 +0000 (17:02 +0100)]
Replace iteritems() with items()
Daniel Martí [Mon, 4 Jan 2016 16:01:37 +0000 (17:01 +0100)]
Replace execfile with open+compile+exec
Daniel Martí [Mon, 4 Jan 2016 16:00:21 +0000 (17:00 +0100)]
Switch to io.StringIO
Daniel Martí [Mon, 4 Jan 2016 15:57:57 +0000 (16:57 +0100)]
Fix imports in Python 3
Since common and metadata import each other, we must import via
"fdroidserver.*".
Daniel Martí [Mon, 4 Jan 2016 15:33:20 +0000 (16:33 +0100)]
Switch all headers to python3
Hans-Christoph Steiner [Thu, 10 Mar 2016 11:27:15 +0000 (11:27 +0000)]
Merge branch 'jenkins-makebs' into 'master'
Jenkins makebs improvements
See merge request !105
Daniel Martí [Thu, 25 Feb 2016 15:03:06 +0000 (15:03 +0000)]
jenkins: build a variety of apps
Daniel Martí [Thu, 25 Feb 2016 14:48:51 +0000 (14:48 +0000)]
jenkins: only build one version per app
Use a specific vercode instead of --latest since we want this to be as
stable as possible.
Daniel Martí [Thu, 25 Feb 2016 14:47:31 +0000 (14:47 +0000)]
jenkins: update fdroiddata if existing
Also, when cloning, no need to specify the branch and only download that
one. We already have only a single branch. And forcing master isn't
necessary.
Daniel Martí [Tue, 8 Mar 2016 23:50:14 +0000 (23:50 +0000)]
build: don't remove wrapper dir gradle/
The point of removing these was to make sure that gradlew wasn't used,
and that our gradle was used instead. Removing the scripts already
accomplishes this.
Removing gradle/ should be harmless, but some apps like I2P re-use this
directory to also hold other stuff that is actually needed. So be safer
and don't remove it at all.
Daniel Martí [Mon, 7 Mar 2016 22:29:45 +0000 (22:29 +0000)]
lint: Also warn about gitlab links missing /issues
Daniel Martí [Mon, 7 Mar 2016 20:53:15 +0000 (20:53 +0000)]
README: Use new CI badge url
Daniel Martí [Sun, 6 Mar 2016 11:32:05 +0000 (11:32 +0000)]
Merge branch 'import' into 'master'
import: Fix usage of .git suffix for gitlab urls
See merge request !107
Boris Kraut [Sun, 6 Mar 2016 10:14:14 +0000 (11:14 +0100)]
import: use .git suffix only for repo-url
Daniel Martí [Sat, 5 Mar 2016 23:54:33 +0000 (23:54 +0000)]
README: Fix CI badge
The old /ci link no longer works. Use the builds page instead.
Daniel Martí [Thu, 3 Mar 2016 15:21:14 +0000 (15:21 +0000)]
CI: Install missing gcc and python-dev packages
Daniel Martí [Thu, 3 Mar 2016 14:19:32 +0000 (14:19 +0000)]
lint: error on `fdroid import` disable line
Daniel Martí [Mon, 29 Feb 2016 23:38:54 +0000 (23:38 +0000)]
CI: No longer needed to install any deps
All the deps come installed in the image now. This saves up a little
time (especially the apt-get update) and makes the CI script much
simpler.
Daniel Martí [Mon, 29 Feb 2016 19:56:02 +0000 (19:56 +0000)]
CI: Use our own image
Daniel Martí [Sun, 28 Feb 2016 13:37:17 +0000 (13:37 +0000)]
Merge branch 'p1' into 'master'
Fix pubkey extraction on update
Replacement of !86.
Fix pubkey extraction in case of non-empty _JAVA_OPTIONS. Fixes #133.
I didn't actually run the test suite (it looks like there are some preparations to be done for that), but I checked the commands from `test_fdroid_popen_stderr_redirect` in ipython.
See merge request !103
Daniel Martí [Sun, 28 Feb 2016 13:35:57 +0000 (13:35 +0000)]
Merge branch 'faster-ci' into 'master'
CI: Install Android SDK only if necessary
See merge request !106
Daniel Martí [Sat, 27 Feb 2016 19:56:32 +0000 (19:56 +0000)]
CI: Install Android SDK only if necessary
Daniel Martí [Tue, 23 Feb 2016 12:42:47 +0000 (12:42 +0000)]
common: make jdk detection more strict
We weren't using ^ and $, so stuff like java-8-openjdk-i386 would match
both the Arch and the Debian regexes. A list with one regex per line in
the same format is also easier to read and maintain.
This might be why java8 isn't being detected properly on our Debian
stable buildserver.
Daniel Martí [Tue, 23 Feb 2016 12:26:00 +0000 (12:26 +0000)]
config.buildserver.py: use new java_paths keys
Daniel Martí [Tue, 23 Feb 2016 12:03:26 +0000 (12:03 +0000)]
build: don't error on .fdroid* files in fdroiddata
This avoids the following incorrect error:
fdroidserver.common.FDroidException: Only one local metadata file allowed! Found: .fdroid.keystorepass.txt .fdroid.keypass.txt
Daniel Martí [Sat, 20 Feb 2016 07:29:12 +0000 (07:29 +0000)]
Merge branch 'scanner-repos' into 'master'
Allow commonsware and gradle plugin repos
This is in a MR because I'm uneasy about adding a semi-random AWS url to the list. But seems like the commonsware guy only publishes jars there, which doesn't make any sense to me.
Any idea @eighthave?
See merge request !102
Daniel Martí [Sat, 20 Feb 2016 06:21:17 +0000 (07:21 +0100)]
docs: add missing maven repos
Daniel Martí [Thu, 18 Feb 2016 13:35:33 +0000 (13:35 +0000)]
Merge branch 'p2' into 'master'
Fix update crash in case of unset dates in APK; add an option to use APK's entry date
I encountered an error when I tried to add [TrackID APK](https://play.google.com/store/apps/details?id=com.sonyericsson.trackid) (files in the APK don't have dates set): as far as I can remember `datetime(*manifest.date_time)` was raising `ValueError`.
Also add an option to use date from APK as this APK's entry date (may be useful in case of a simple binary repo): `fdroid update --use-date-from-apk`.
I should have split this commit, but I hope this would be OK too.
See merge request !104
Dmitriy Bogdanov [Thu, 18 Feb 2016 12:11:18 +0000 (16:11 +0400)]
Add '--use-date-from-apk' option to bash-completion
Dmitriy Bogdanov [Thu, 18 Feb 2016 12:41:43 +0000 (16:41 +0400)]
Add an option to use dates from APK
Dmitriy Bogdanov [Thu, 18 Feb 2016 12:40:51 +0000 (16:40 +0400)]
Fix update crash in case of unset dates in APK
Hans-Christoph Steiner [Thu, 18 Feb 2016 10:47:02 +0000 (11:47 +0100)]
setup.py: fix missing comma in classifiers
Hans-Christoph Steiner [Thu, 18 Feb 2016 10:40:47 +0000 (11:40 +0100)]
`python setup.py release` alias for making official releases
Daniel Martí [Thu, 18 Feb 2016 09:15:47 +0000 (09:15 +0000)]
Bump to 0.6.0
Dmitriy Bogdanov [Wed, 17 Feb 2016 20:45:06 +0000 (00:45 +0400)]
Add FDroidPopen usage test
Dmitriy Bogdanov [Wed, 17 Feb 2016 18:22:57 +0000 (22:22 +0400)]
Fix pubkey extraction on update
Fix pubkey extraction in case of non-empty _JAVA_OPTIONS
Ciaran Gultnieks [Wed, 17 Feb 2016 14:37:46 +0000 (14:37 +0000)]
Change can't update category name - closes #80
Daniel Martí [Wed, 17 Feb 2016 13:00:05 +0000 (13:00 +0000)]
Allow commonsware and gradle plugin repos
Daniel Martí [Wed, 17 Feb 2016 11:40:12 +0000 (11:40 +0000)]
Merge branch 'debian-import-freeze' into 'master'
Debian import freeze
These are the issues as discussed in today's meeting. More in the commit messages, and mostly, in the related issues.
See merge request !101
Hans-Christoph Steiner [Tue, 16 Feb 2016 23:11:22 +0000 (00:11 +0100)]
make "Current Version Code" default to most recent APK
closes #36 https://gitlab.com/fdroid/fdroidserver/issues/36
Hans-Christoph Steiner [Tue, 16 Feb 2016 22:43:23 +0000 (23:43 +0100)]
added 'mirrors' option to config for giving official mirror URLs
serverwebroot has long supported uploading to multiple servers, this bit of
metadata communicates those official mirrors to the client so that it can
automatically do something useful with that information.
closes #14 https://gitlab.com/fdroid/fdroidserver/issues/14
Hans-Christoph Steiner [Tue, 16 Feb 2016 22:36:27 +0000 (23:36 +0100)]
use utf-8 as default encoding for config.py
This makes it easy to add all languages to the description.
Hans-Christoph Steiner [Mon, 15 Feb 2016 22:09:55 +0000 (22:09 +0000)]
Merge branch 'full-bsd-osx-port' into 'master'
Full BSD/OSX port
This finishes up the OSX port by getting the full test suite running on OSX. It also sets up an OSX CI job travis-ci.org, run as part of the github mirror here: https://github.com/f-droid/fdroidserver You can see those CI builds here: https://travis-ci.org/f-droid/fdroidserver
This should translate entirely to *BSD since OSX's user land is merged with FreeBSD.
See merge request !100
Hans-Christoph Steiner [Mon, 15 Feb 2016 22:06:23 +0000 (23:06 +0100)]
travis-ci: make pip install deps based on setup.py
Hans-Christoph Steiner [Mon, 15 Feb 2016 19:22:17 +0000 (20:22 +0100)]
PEP8 fix E225 missing whitespace around operator
Hans-Christoph Steiner [Mon, 15 Feb 2016 13:00:52 +0000 (14:00 +0100)]
travis-ci: run test suite on OSX and GNU/Linux
Hans-Christoph Steiner [Mon, 15 Feb 2016 18:58:05 +0000 (19:58 +0100)]
init: check if examples/ exists in layout before using the path
There is definitely some odd stuff that happens in all these paths, so
let's just check that examples/ exists, and move on from there.
Hans-Christoph Steiner [Mon, 15 Feb 2016 15:25:43 +0000 (16:25 +0100)]
pre-commit: make pyflakes optional to support older platforms
Travis-CI defaults to Ubuntu/precise, which has a very old version of
pyflakes that throws false positives.
Hans-Christoph Steiner [Mon, 15 Feb 2016 15:17:24 +0000 (16:17 +0100)]
support BSD and GNU sed in tests
Hans-Christoph Steiner [Mon, 15 Feb 2016 14:29:11 +0000 (15:29 +0100)]
run-tests: use OSX/BSD compatible `mktemp -d`
-d requires an arg on BSD
Hans-Christoph Steiner [Mon, 15 Feb 2016 13:33:27 +0000 (14:33 +0100)]
only test ./gendocs on GNU/Linux
This helps with getting the tests running on OSX and other platforms.
Hans-Christoph Steiner [Mon, 15 Feb 2016 10:40:35 +0000 (11:40 +0100)]
complete-ci-tests: exit with error if setup is not correct
Daniel Martí [Mon, 15 Feb 2016 13:49:12 +0000 (13:49 +0000)]
Forgot to remove the output= debug prints
Daniel Martí [Mon, 15 Feb 2016 12:01:43 +0000 (12:01 +0000)]
pre-commit: fix multiple file issue
When using -z, you should always quote. If not, stuff like this happens:
.git/hooks/pre-commit: line 10: [: too many arguments
Daniel Martí [Mon, 15 Feb 2016 12:01:38 +0000 (12:01 +0000)]
output= is now a glob path and can do gradle
Daniel Martí [Mon, 15 Feb 2016 11:44:07 +0000 (11:44 +0000)]
Add gradle 2.11
Daniel Martí [Mon, 15 Feb 2016 11:37:56 +0000 (11:37 +0000)]
gradle wrapper script: add plugin 1.5
Daniel Martí [Fri, 12 Feb 2016 09:13:53 +0000 (09:13 +0000)]
Merge branch 'master' into 'master'
a couple fixes
these are three fixes, one related to my previous merge request, as discussed with @mvdan in IRC
See merge request !99
Hans-Christoph Steiner [Thu, 11 Feb 2016 23:39:54 +0000 (00:39 +0100)]
fix PEP9 E713 test for membership should be 'not in'
Hans-Christoph Steiner [Thu, 11 Feb 2016 23:27:17 +0000 (00:27 +0100)]
fix errors in pre-commit hook when run in test suite
Hans-Christoph Steiner [Tue, 4 Aug 2015 14:09:44 +0000 (16:09 +0200)]
build: check that metadata is present before creating tmp dirs
Before, `fdroid build` would create some subdirs, then fail when it could
not read the metadata via metadata.read_metadata(). This checks before
whether there is any metadata available, and warns the user accordingly.
Hans-Christoph Steiner [Thu, 11 Feb 2016 22:49:54 +0000 (23:49 +0100)]
common: do not crash if the java_paths are not what is expected
Many commands work without the JDK installed, and it is also possible that
someone is using only JDK 8 or 9.
Daniel Martí [Thu, 11 Feb 2016 21:48:51 +0000 (21:48 +0000)]
common: add regexp for arch oracle paths
Daniel Martí [Thu, 11 Feb 2016 21:34:44 +0000 (21:34 +0000)]
common: fix JDK detection on latest arch
Hans-Christoph Steiner [Thu, 11 Feb 2016 20:47:29 +0000 (20:47 +0000)]
Merge branch 'auto-detect-java-homes' into 'master'
Auto detect java homes
There are a wide variety of possible JDKs (OpenJDK, Oracle, OSX, etc.) as well as standard paths for the JDK. This includes code to look in standard paths for various platforms and enumerate the installed JDKs (e.g. 6, 7, 8, 9). That is then used for `JAVA[6-9]_HOME` env vars and the path for `jarsigner` and `keytool`.
See merge request !98
Hans-Christoph Steiner [Thu, 11 Feb 2016 19:43:55 +0000 (20:43 +0100)]
use jarsigner and keytool from same JDK as is being set in JAVA7_HOME
Using the same JDK throughout should prevent weird bugs where a setup might
use Java8's jarsigner and Java7's keytool. This also allows the user to
set java_paths and have jarsigner and keytool used from that specified JDK.
This incorporates almost all of the patch that is in the Debian package
that forces fdroidserver to use the default JDK on that Debian release.
closes #93 https://gitlab.com/fdroid/fdroidserver/issues/93
Hans-Christoph Steiner [Fri, 5 Feb 2016 23:29:07 +0000 (00:29 +0100)]
automatically detect various installed JDKs and set JAVA[6-9]_HOME
This checks for which JDKs are installed in common locations, then sets the
JAVA[6-9]_HOME env vars needed by some build environments.
Hans-Christoph Steiner [Thu, 4 Feb 2016 07:42:53 +0000 (08:42 +0100)]
makebuildserver: add workaround to Ubuntu/trusty's old paramiko
Ubuntu trusty 14.04's paramiko does not work with jessie's openssh's
default settings, so they need to be tweaked in order to provide working
ssh to the instance.
https://stackoverflow.com/questions/
7286929/paramiko-incompatible-ssh-peer-no-acceptable-kex-algorithm/
32691055#
32691055
Daniel Martí [Thu, 11 Feb 2016 19:06:22 +0000 (19:06 +0000)]
Merge branch 'jmastr/use_tag_if_version_name_is_unknown' into 'master'
use tag if version name is unknown
If we don't find the version name neither in the AndroidManifest.xml nor
in the build.grade file, we fallback to the tag the user specified to
search for.
That way we have a better version name than 'Unknown'.
See merge request !97
Julian Strobl [Thu, 11 Feb 2016 18:50:16 +0000 (19:50 +0100)]
use tag if version name is unknown
If we don't find the version name neither in the AndroidManifest.xml nor
in the build.grade file, we fallback to the tag the user specified to
search for.
That way we have a better version name than 'Unknown'.
Daniel Martí [Wed, 10 Feb 2016 15:57:19 +0000 (15:57 +0000)]
Merge branch 'prevo' into 'master'
Add libexpat1-dev and libglib2.0-dev to the default recipe
These are needed to build the PrevoDB srcdep of
uk.co.busydoingnothing.prevo.
See merge request !96
Neil Roberts [Wed, 10 Feb 2016 14:50:50 +0000 (14:50 +0000)]
Add libexpat1-dev and libglib2.0-dev to the default recipe
These are needed to build the PrevoDB srcdep of
uk.co.busydoingnothing.prevo.
Daniel Martí [Mon, 8 Feb 2016 16:07:27 +0000 (16:07 +0000)]
Merge branch 'jenkins-makebuildserver-works' into 'master'
Jenkins ./makebuildserver works!
These commits get `./makebuildserver` running in a Jenkins job. It builds the whole setup from scratch every time, including the vagrant and virtualbox setups.
Also, this modifies the git pre-commit hook to only run on the files being committed when called by git.
See merge request !95
Hans-Christoph Steiner [Wed, 3 Feb 2016 21:02:50 +0000 (22:02 +0100)]
test ./makebuildserver by running a build in jenkins
Hans-Christoph Steiner [Wed, 3 Feb 2016 21:00:48 +0000 (22:00 +0100)]
script to run ./makebuildserver on Jenkins instances
This is being used to run it on both Guardian Project's and Debian's
Jenkins instances.
Hans-Christoph Steiner [Thu, 28 Jan 2016 12:00:18 +0000 (13:00 +0100)]
makebuildserver: default memory to 1024MB, so it runs on normal machines
4 gigs is still a common amount of RAM these days for laptops, if the VM
takes almost all of that, it makes the machine drag to almost a halt. Most
apps build fine in 1gig of RAM, indeed that's the default for most CI
instances, like travis-ci and gitlab-ci.
Hans-Christoph Steiner [Tue, 26 Jan 2016 10:21:21 +0000 (11:21 +0100)]
allow setting up an apt package cache for the build server setup
This creates a cache folder which will store the apt cache from the VM.
Hans-Christoph Steiner [Tue, 26 Jan 2016 21:06:10 +0000 (22:06 +0100)]
makebuildserver: make chef find the custom cache locations
Hans-Christoph Steiner [Wed, 3 Feb 2016 13:48:40 +0000 (14:48 +0100)]
make git pre-commit hook only test files to be committed
Right now, the git pre-commit hook is pretty annoying to work with when
development since it tests every single file. That means notes, incomplete
stuff, etc. will be run through the tests. So all of the files need to be
clean in order to commit even a single trivial fix. This commit changes it
so that the pre-commit hook is only run on the files staged to be committed.
Daniel Martí [Sun, 31 Jan 2016 21:29:31 +0000 (21:29 +0000)]
lint: also check for trailing spaces in names
I was wrong - we don't check for trailing whitespaces on lines. That
would have to happen at parse time, not in the linter, so it would slow
things down and would become an error, not a warning. Not really worth
it.
Daniel Martí [Sun, 31 Jan 2016 21:26:31 +0000 (21:26 +0000)]
Merge branch 'authorregex' into 'master'
lint: check whitespaces in "Author Name"
See merge request !94
Boris Kraut [Sun, 31 Jan 2016 11:53:38 +0000 (12:53 +0100)]
lint: check whitespaces in "Author Name"
Daniel Martí [Sun, 31 Jan 2016 13:26:26 +0000 (13:26 +0000)]
Merge branch 'licenses' into 'master'
wp-fdroid: Linkify more licenses
See merge request !90
Daniel Martí [Sun, 31 Jan 2016 13:25:03 +0000 (13:25 +0000)]
Merge branch 'patch-1' into 'master'
Support 'gpgkey' option as announced in sample config.
See merge request !93
Marvin W [Wed, 27 Jan 2016 15:51:03 +0000 (15:51 +0000)]
Support 'gpgkey' option as announced in sample config.
Ciaran Gultnieks [Tue, 26 Jan 2016 22:01:28 +0000 (22:01 +0000)]
Tidy up/fix some vagrant issues
1. It is packaged in modern versions of distros, update docs accordingly
2. 1.1 is hopelessly outdated - support 1.4 onwards
3. Check the version properly, and write a better config (previously it
wrote the 1.1 config for 1.1 and 1.3+
4. Ensure that the default share from later versions is not present when
building, it's only required for provisioning.
Ciaran Gultnieks [Tue, 26 Jan 2016 22:00:00 +0000 (22:00 +0000)]
Handle with invalid manifests better
In other words, don't blow up and kill a whole checkupdates run just
because one version of one package has some invalid xml.
Daniel Martí [Tue, 26 Jan 2016 19:52:12 +0000 (19:52 +0000)]
Merge branch 'makebuildserver-jenkins-fixes' into 'master'
Makebuildserver jenkins fixes
more stuff related to the Debian jenkins build
See merge request !92