chiark / gitweb /
fdroidserver.git
6 years agobuild: set overall timeout to 36 hours
relan [Mon, 12 Feb 2018 10:45:49 +0000 (13:45 +0300)]
build: set overall timeout to 36 hours

Currently f-droid.org has a lot of pending builds and big delays
between "fdroid build --all" runs. Bump overall build time limit from
12 hours to 36 hours to increase buildserver throughput.

6 years agomakebuildserver: remove NDK r9b to save 1.6 GB of disk space
relan [Mon, 12 Feb 2018 06:16:03 +0000 (09:16 +0300)]
makebuildserver: remove NDK r9b to save 1.6 GB of disk space

NDK r9b is used by only one app (net.gorry.android.input.nicownng) that
was last updated in 2015.

6 years agomakebuildserver: upgrade NDK r16 to r16b
relan [Sun, 11 Feb 2018 07:20:42 +0000 (10:20 +0300)]
makebuildserver: upgrade NDK r16 to r16b

6 years agomakebuildserver: add Gradle 4.5.1
relan [Sun, 11 Feb 2018 07:08:06 +0000 (10:08 +0300)]
makebuildserver: add Gradle 4.5.1

6 years agometadata: write values of TYPE_INT fields
relan [Tue, 6 Feb 2018 09:27:34 +0000 (12:27 +0300)]
metadata: write values of TYPE_INT fields

Otherwise we end up with empty values after "fdroid rewritemeta".

6 years agobuild: clear timeout flag before every build
Marcus Hoffmann [Wed, 7 Feb 2018 19:46:29 +0000 (20:46 +0100)]
build: clear timeout flag before every build

This fixes the weird logging behaviour where after a build that timed
out all subsequent failed builds would also show up as timed out.

6 years agoMerge branch 'translation-app-field' into 'master'
Hans-Christoph Steiner [Mon, 5 Feb 2018 15:16:43 +0000 (15:16 +0000)]
Merge branch 'translation-app-field' into 'master'

metadata: add new Translation app field for URL for contributions

See merge request fdroid/fdroidserver!450

6 years agoMerge branch 'popen-stdin-devnull' into 'master'
Hans-Christoph Steiner [Mon, 5 Feb 2018 14:46:08 +0000 (14:46 +0000)]
Merge branch 'popen-stdin-devnull' into 'master'

common: use /dev/null as stdin when calling subprocess.Popen()

See merge request fdroid/fdroidserver!451

6 years agometadata: add new Translation app field for URL for contributions
Hans-Christoph Steiner [Tue, 30 Jan 2018 10:14:36 +0000 (11:14 +0100)]
metadata: add new Translation app field for URL for contributions

This is a field requested from a bunch of translators so they can easily
find where to translate apps:
https://forum.f-droid.org/t/translation-field-for-app-entries/1403/5

6 years agocommon: use /dev/null as stdin when calling subprocess.Popen()
relan [Mon, 5 Feb 2018 12:34:42 +0000 (15:34 +0300)]
common: use /dev/null as stdin when calling subprocess.Popen()

We always want to run all utilities non-interactively. By default
subprocess.Popen() inherits stdin descriptor from parent process, i.e.
when fdroid is run from an interactive shell, subprocesses may expect
input from it.

Reading from /dev/null immediately returns EOF, failing any user prompt
and preventing us from hang.

6 years agolint: check srclibs has name and @ in it
Hans-Christoph Steiner [Wed, 31 Jan 2018 12:33:06 +0000 (13:33 +0100)]
lint: check srclibs has name and @ in it

fdroiddata!2863

6 years agoMerge branch 'master' into 'master'
Hans-Christoph Steiner [Wed, 31 Jan 2018 10:01:18 +0000 (10:01 +0000)]
Merge branch 'master' into 'master'

Option --resetserver does nothing; have it used instead

See merge request fdroid/fdroidserver!449

6 years agoChange --resetserver to --reset-server for consistency
csagan5 [Tue, 30 Jan 2018 19:45:03 +0000 (20:45 +0100)]
Change --resetserver to --reset-server for consistency

6 years agoOption --resetserver does nothing; have it used instead
csagan5 [Tue, 30 Jan 2018 13:50:35 +0000 (14:50 +0100)]
Option --resetserver does nothing; have it used instead

6 years agoMerge branch 'build-timeout-customization' into 'master'
Hans-Christoph Steiner [Tue, 30 Jan 2018 10:22:08 +0000 (11:22 +0100)]
Merge branch 'build-timeout-customization' into 'master'

build: make per-build hard time limit customizable

See merge request fdroid/fdroidserver!446

6 years agofix metadata test: remove timeout= from comparison
Hans-Christoph Steiner [Tue, 30 Jan 2018 10:20:30 +0000 (11:20 +0100)]
fix metadata test: remove timeout= from comparison

6 years agobuild: make per-build hard time limit customizable
relan [Sun, 28 Jan 2018 06:56:19 +0000 (09:56 +0300)]
build: make per-build hard time limit customizable

Add "timeout=n" metadata field that overrides build timeout (in seconds).
The default is 7200, i.e. 2 hours.

6 years agoMerge branch 'gradle-4.5' into 'master'
relan [Tue, 30 Jan 2018 06:12:32 +0000 (06:12 +0000)]
Merge branch 'gradle-4.5' into 'master'

makebuildserver: add gradle 4.5

See merge request fdroid/fdroidserver!448

6 years agomakebuildserver: add gradle 4.5
Marcus Hoffmann [Mon, 29 Jan 2018 16:55:48 +0000 (17:55 +0100)]
makebuildserver: add gradle 4.5

6 years agoMerge branch 'crash-and-standard-imports' into 'master'
Hans-Christoph Steiner [Mon, 29 Jan 2018 09:24:48 +0000 (09:24 +0000)]
Merge branch 'crash-and-standard-imports' into 'master'

Crash and standard imports

See merge request fdroid/fdroidserver!445

6 years agoMerge branch 'minor-security-ish-tweaks' into 'master'
Hans-Christoph Steiner [Mon, 29 Jan 2018 09:23:25 +0000 (09:23 +0000)]
Merge branch 'minor-security-ish-tweaks' into 'master'

security-ish tweaks

See merge request fdroid/fdroidserver!442

6 years agovmtools: use standard imports: os.remove()
Hans-Christoph Steiner [Fri, 26 Jan 2018 09:18:07 +0000 (10:18 +0100)]
vmtools: use standard imports: os.remove()

The rest of the code uses os.remove()

6 years agovmtools: use standard imports: os.path.join()
Hans-Christoph Steiner [Fri, 26 Jan 2018 09:17:19 +0000 (10:17 +0100)]
vmtools: use standard imports: os.path.join()

The rest of the code uses os.path.join()

6 years agometadata: fix crash when there are duplicate metadata files
Hans-Christoph Steiner [Thu, 25 Jan 2018 09:02:13 +0000 (10:02 +0100)]
metadata: fix crash when there are duplicate metadata files

The string had the variable 'appid' while the format() call had only the
variable 'path'.  This also standardizes on 'appid' like the rest of the
code.

6 years agouse standard User-Agent in check-fdroid-apk
Hans-Christoph Steiner [Wed, 24 Jan 2018 05:39:23 +0000 (06:39 +0100)]
use standard User-Agent in check-fdroid-apk

6 years agoshell=True is too dangerous to allow; there are unfiltered user inputs
Hans-Christoph Steiner [Tue, 23 Jan 2018 22:56:15 +0000 (23:56 +0100)]
shell=True is too dangerous to allow; there are unfiltered user inputs

There are all sorts of unfiltered user inputs like tag and branch names in
source repos.  If those names are fed into popen calls that use shell=True,
that opens up a wide range of exploits.  All core operations should never
use shell=True.

6 years agouse '--' in source vcs calls to protect against malicious input
Hans-Christoph Steiner [Tue, 23 Jan 2018 21:42:32 +0000 (22:42 +0100)]
use '--' in source vcs calls to protect against malicious input

This is a quick and very incomplete addition of '--' to command line calls
to source VCSs like git and hg that could manipulated by malicious
tag/branch names or other vectors.

These were all manually tested by calling the command lines on my own
machine.

6 years agoscanner: allow running without versionCode and as API
Hans-Christoph Steiner [Tue, 23 Jan 2018 20:55:37 +0000 (21:55 +0100)]
scanner: allow running without versionCode and as API

This lets `fdroid scanner my.package.name` run without requiring that the
versionCode is also specified.  It also allows scanner.scan_source() to be
called as a function in the public API of fdroidserver.

6 years agolint: check description for forbidden HTML tags: iframe, link, script, etc.
Hans-Christoph Steiner [Tue, 23 Jan 2018 16:13:49 +0000 (17:13 +0100)]
lint: check description for forbidden HTML tags: iframe, link, script, etc.

6 years agobuildserver: include python3-git for future use
Hans-Christoph Steiner [Tue, 23 Jan 2018 16:12:32 +0000 (17:12 +0100)]
buildserver: include python3-git for future use

We should be replacing all our custom git shell commands with python3-git,
since it is a common library for doing that.  It will receive a lot more
attention and maintenance than our code for doing it.  For example, we
should not ever use shell=True, since that opens up a lot of security
risks.

6 years agowiki: include per-app link to all related activity on gitlab.com
Hans-Christoph Steiner [Tue, 23 Jan 2018 08:35:41 +0000 (09:35 +0100)]
wiki: include per-app link to all related activity on gitlab.com

6 years agoMerge branch 'platform27' into 'master'
Hans-Christoph Steiner [Fri, 26 Jan 2018 09:09:15 +0000 (09:09 +0000)]
Merge branch 'platform27' into 'master'

makebuildserver: re-add platform 27

Closes #445

See merge request fdroid/fdroidserver!444

6 years agomakebuildserver: re-add platform 27
Marcus Hoffmann [Thu, 25 Jan 2018 13:09:16 +0000 (14:09 +0100)]
makebuildserver: re-add platform 27

Closes #445

6 years agoMerge branch 'build_tools_27.0.3' into 'master'
Marcus [Thu, 25 Jan 2018 13:12:53 +0000 (13:12 +0000)]
Merge branch 'build_tools_27.0.3' into 'master'

makebuildserver: add build-tools 27.0.3

See merge request fdroid/fdroidserver!443

6 years agomakebuildserver: add build-tools 27.0.3
Marcus Hoffmann [Thu, 25 Jan 2018 10:53:27 +0000 (11:53 +0100)]
makebuildserver: add build-tools 27.0.3

6 years agoMerge branch 'remove-kivy' into 'master'
Hans-Christoph Steiner [Wed, 24 Jan 2018 05:35:32 +0000 (05:35 +0000)]
Merge branch 'remove-kivy' into 'master'

build: remove unused, unmaintained Kivy build method

See merge request fdroid/fdroidserver!441

6 years agobuild: remove unused, unmaintained Kivy build method
Hans-Christoph Steiner [Tue, 23 Jan 2018 22:16:05 +0000 (23:16 +0100)]
build: remove unused, unmaintained Kivy build method

This code has never been used and contains some insecure uses of shell=True
Building Kivy apps should be done with the buildozer=yes method.  The
buildozer method should probably be moved to a provisioner once that is in
place.

6 years agoMerge branch 'remove-qt' into 'master'
Hans-Christoph Steiner [Tue, 23 Jan 2018 20:52:22 +0000 (20:52 +0000)]
Merge branch 'remove-qt' into 'master'

buildserver: remove Qt installer, its huge, outdated, and being replaced

See merge request fdroid/fdroidserver!440

6 years agobuildserver: remove Qt installer, its huge, outdated, and being replaced
Hans-Christoph Steiner [Tue, 23 Jan 2018 16:55:48 +0000 (17:55 +0100)]
buildserver: remove Qt installer, its huge, outdated, and being replaced

The currently included Qt has known security issues and is outdated.  This
can now be replaced by downloading and installing the Qt installer using
the sudo= build field.  @relan's provisioner system will also replace this
once that's done.  There are only two apps that currently use the Qt stuff:

* csd.qtproject.minesweeper
* org.openorienteering.mapper

6 years agoMerge branch 'build_timeout' into 'master'
Hans-Christoph Steiner [Mon, 22 Jan 2018 20:49:01 +0000 (20:49 +0000)]
Merge branch 'build_timeout' into 'master'

Build timeout

See merge request fdroid/fdroidserver!437

6 years agomain: force exit on keyboard interrupt
Marcus Hoffmann [Sat, 20 Jan 2018 19:48:02 +0000 (20:48 +0100)]
main: force exit on keyboard interrupt

This applies the same workaround as b8ed892ad9ed7e125278b.

6 years agobuild: add global soft timeout of 12 hours
Marcus Hoffmann [Fri, 19 Jan 2018 21:35:06 +0000 (22:35 +0100)]
build: add global soft timeout of 12 hours

Only start new builds for 12 hours. This ensures we publish new builds
often enough even on long backlogs.

This could be made configurable at a later point.

6 years agobuild: log timeouts to the wiki
Marcus Hoffmann [Sat, 20 Jan 2018 21:16:39 +0000 (22:16 +0100)]
build: log timeouts to the wiki

6 years agobuild: enable watchdog timer for each build that kills in 2 hours
Marcus Hoffmann [Mon, 15 Jan 2018 00:03:47 +0000 (01:03 +0100)]
build: enable watchdog timer for each build that kills in 2 hours

This introduces locking for the commonly used vagrant functions in
vmtools because vagrant fails when another vagrant command is
already running.

6 years agoRevert "build: bump max_apps_per_run to 50"
Marcus Hoffmann [Mon, 15 Jan 2018 00:08:23 +0000 (01:08 +0100)]
Revert "build: bump max_apps_per_run to 50"

This reverts commit 56a53055bef857d7cf0f76eb7b485a2f6e85ac2a.

Revert "build: limit --all to 10 apps at a time"

This reverts commit afc5cc6b6a969bb1f12eb325df436eaadac53099.

6 years agoMerge branch 'log-update-checkupdates-server-to-wiki' into 'master'
Hans-Christoph Steiner [Mon, 22 Jan 2018 13:29:45 +0000 (13:29 +0000)]
Merge branch 'log-update-checkupdates-server-to-wiki' into 'master'

Log update/checkupdates/server to wiki

See merge request fdroid/fdroidserver!439

6 years agogitlab-ci: make metadata_v0 test work even when tags are missing
Hans-Christoph Steiner [Thu, 18 Jan 2018 09:02:29 +0000 (10:02 +0100)]
gitlab-ci: make metadata_v0 test work even when tags are missing

This uses the commit ID of the release tags, rather than the release tag
itself so that contributor forks do not need to include the tags in them
for this test to work.

The COMMIT_ID should be bumped after each release, so that the list of sed
hacks needed does not continuously grow.

6 years agowiki: log build start/stop time, command line, RAM, and processor count
Hans-Christoph Steiner [Mon, 22 Jan 2018 13:00:16 +0000 (14:00 +0100)]
wiki: log build start/stop time, command line, RAM, and processor count

6 years agowiki: log server start/stop times and command line
Hans-Christoph Steiner [Wed, 17 Jan 2018 21:21:15 +0000 (22:21 +0100)]
wiki: log server start/stop times and command line

6 years agobuildserver: force no auto updates of package lists or upgrades
Hans-Christoph Steiner [Wed, 17 Jan 2018 20:04:08 +0000 (21:04 +0100)]
buildserver: force no auto updates of package lists or upgrades

6 years agojenkins-test: include repo_pubkey in config.py for BUILD test
Hans-Christoph Steiner [Wed, 17 Jan 2018 19:01:51 +0000 (20:01 +0100)]
jenkins-test: include repo_pubkey in config.py for BUILD test

The BUILD machine does not have a keyring on it, only the public key for
the index signing key.  This is a very rudementary test for that.

6 years agowiki: move checkupdates wiki log to separate function
Hans-Christoph Steiner [Wed, 17 Jan 2018 20:11:32 +0000 (21:11 +0100)]
wiki: move checkupdates wiki log to separate function

6 years agolog installed android sdk versions for update and checkupdates
Hans-Christoph Steiner [Wed, 17 Jan 2018 16:17:26 +0000 (17:17 +0100)]
log installed android sdk versions for update and checkupdates

6 years agomove get_android_tools_versions functions to common
Hans-Christoph Steiner [Wed, 17 Jan 2018 16:13:12 +0000 (17:13 +0100)]
move get_android_tools_versions functions to common

6 years agowiki: log update start/stop time and command line
Hans-Christoph Steiner [Wed, 17 Jan 2018 14:21:59 +0000 (15:21 +0100)]
wiki: log update start/stop time and command line

6 years agowiki: fix bug updating Repository Maintenance
Hans-Christoph Steiner [Wed, 17 Jan 2018 14:22:48 +0000 (15:22 +0100)]
wiki: fix bug updating Repository Maintenance

site.pages doesn't seem to exist anywhere, site.Pages is used throughout.

6 years agowiki: log appids as checkupdates goes through them
Hans-Christoph Steiner [Wed, 17 Jan 2018 14:21:16 +0000 (15:21 +0100)]
wiki: log appids as checkupdates goes through them

6 years agowiki: log checkupdates start/stop time and command line for each run
Hans-Christoph Steiner [Wed, 17 Jan 2018 14:18:05 +0000 (15:18 +0100)]
wiki: log checkupdates start/stop time and command line for each run

6 years agocommon.get_wiki_timestamp() for posting timestamps to wiki log pages
Hans-Christoph Steiner [Wed, 17 Jan 2018 13:39:54 +0000 (14:39 +0100)]
common.get_wiki_timestamp() for posting timestamps to wiki log pages

6 years agoMerge branch 'iconfix' into 'master'
Hans-Christoph Steiner [Thu, 18 Jan 2018 10:53:34 +0000 (10:53 +0000)]
Merge branch 'iconfix' into 'master'

fix "cannot identify image file" with XML icons

See merge request fdroid/fdroidserver!435

6 years agoMerge branch 'gitlab-mirrors-reorder' into 'master'
Hans-Christoph Steiner [Thu, 18 Jan 2018 09:01:17 +0000 (09:01 +0000)]
Merge branch 'gitlab-mirrors-reorder' into 'master'

Reorder the gitlab mirrors so GitLab Pages comes before "raw".

See merge request fdroid/fdroidserver!438

6 years agoReorder the gitlab mirrors so GitLab Pages comes before "raw".
Peter Serwylo [Wed, 17 Jan 2018 21:02:07 +0000 (08:02 +1100)]
Reorder the gitlab mirrors so GitLab Pages comes before "raw".

GitLab storage provides two mirrors by default:
 * https://gitlab.com/user/repo/raw/master/fdroid/repo
 * https://user.gitlab.io/repo/fdroid/repo

While the F-Droid client will happily fetch the index*.jar files and
parse them from either of these two mirrors, only the GitLab Pages
mirror will serve files with the correct mime type. Many repos
tend to put index.html files (and associated .css/.js/image files) in
the root of a repository to provide information about that repo.

One example is RepoMaker. The way in which RepoMaker decides the public
URL of a repo, is to take the first mirror in the list. This means that
the URL which RepoMaker directs people to for GitLab storage returns a
.html document in text/plain, which means that it is not rendered.

We could change RepoMaker so that it takes the last mirror, and then it
woruld work. However there is something nice about the first mirror in a
list being the most authoritative (even though the mirror order doesn't
- and perhaps shouldn't have any specific meaning).

6 years agosimplifying fix for "cannot identify image file" with XML icons
Izzy [Wed, 17 Jan 2018 15:48:08 +0000 (16:48 +0100)]
simplifying fix for "cannot identify image file" with XML icons

6 years agofix "cannot identify image file" with XML icons
Izzy [Fri, 12 Jan 2018 21:12:27 +0000 (22:12 +0100)]
fix "cannot identify image file" with XML icons

6 years agobuild: bump max_apps_per_run to 50
Hans-Christoph Steiner [Thu, 11 Jan 2018 22:25:31 +0000 (23:25 +0100)]
build: bump max_apps_per_run to 50

With this at 10, it seems that there are often runs that produce no builds
at all.  That's bad.

6 years agojenkins-build-all: don't fail if max build limit caused no builds
Hans-Christoph Steiner [Thu, 11 Jan 2018 22:25:24 +0000 (23:25 +0100)]
jenkins-build-all: don't fail if max build limit caused no builds

6 years agojenkins-test: ensure gpg is starting from a clean and proper place
Hans-Christoph Steiner [Thu, 11 Jan 2018 19:55:36 +0000 (20:55 +0100)]
jenkins-test: ensure gpg is starting from a clean and proper place

There have been frequent failures on import, some bugs suggest that it
might be because these dirs are missing.  They would get wiped by a
`git clean -fdx`.

6 years agojenkins-build-all: use local mediawiki if available
Hans-Christoph Steiner [Thu, 11 Jan 2018 15:47:49 +0000 (16:47 +0100)]
jenkins-build-all: use local mediawiki if available

6 years agobuild: buildserverid must always be str not bytes
Hans-Christoph Steiner [Thu, 11 Jan 2018 11:56:28 +0000 (12:56 +0100)]
build: buildserverid must always be str not bytes

6 years agobuild: fix str vs. bytes error in buildserverid
Hans-Christoph Steiner [Thu, 11 Jan 2018 11:28:49 +0000 (12:28 +0100)]
build: fix str vs. bytes error in buildserverid

ERROR: Could not build app org.fdroid.fdroid due to unknown error: Traceback (most recent call last):
  File "/var/lib/jenkins/userContent/reproducible/reproducible_setup_fdroid_build_environment/fdroidserver/build.py", line 1202, in main
    options.onserver, options.refresh):
  File "/var/lib/jenkins/userContent/reproducible/reproducible_setup_fdroid_build_environment/fdroidserver/build.py", line 972, in trybuild
    build_server(app, build, vcs, build_dir, output_dir, log_dir, force)
  File "/var/lib/jenkins/userContent/reproducible/reproducible_setup_fdroid_build_environment/fdroidserver/build.py", line 82, in build_server
    logging.debug(_('Fetched buildserverid from VM: ') + buildserverid)
TypeError: Can't convert 'bytes' object to str implicitly

6 years agoMerge branch 'cleaner-clean' into 'master'
Hans-Christoph Steiner [Wed, 10 Jan 2018 19:14:49 +0000 (19:14 +0000)]
Merge branch 'cleaner-clean' into 'master'

build: clean up only known subdirectories in build/*

Closes #438

See merge request fdroid/fdroidserver!432

6 years agobuild: clean up only known subdirectories in build/*
relan [Wed, 10 Jan 2018 18:06:32 +0000 (21:06 +0300)]
build: clean up only known subdirectories in build/*

We remove the whole "build" directory while cleaning source code tree
because Gradle can leave there files even after "gradle clean". But some
projects (Mozilla Fennec) actually have useful stuff checked into VCS
under the "build" directory.

Remove only those subdirectories that we known for sure are leftovers
from Gradle.

Fixes fdroid/fdroidserver#438.

6 years agoMerge branch 'gradle-4.4.1' into 'master'
Marcus [Wed, 10 Jan 2018 18:40:36 +0000 (18:40 +0000)]
Merge branch 'gradle-4.4.1' into 'master'

makebuildserver: add Gradle 4.4.1

See merge request fdroid/fdroidserver!433

6 years agomakebuildserver: add Gradle 4.4.1
relan [Wed, 10 Jan 2018 18:31:59 +0000 (21:31 +0300)]
makebuildserver: add Gradle 4.4.1

6 years agoMerge branch 'master' into 'master'
Hans-Christoph Steiner [Fri, 5 Jan 2018 13:47:48 +0000 (13:47 +0000)]
Merge branch 'master' into 'master'

new script to audit the FDroid.apk on https://f-droid.org

See merge request fdroid/fdroidserver!431

6 years agonew script to audit the FDroid.apk on https://f-droid.org
Hans-Christoph Steiner [Fri, 5 Jan 2018 13:08:14 +0000 (14:08 +0100)]
new script to audit the FDroid.apk on https://f-droid.org

This makes sure its signed by the F-Droid key.

6 years agoREADME: fix name on CI badges
Hans-Christoph Steiner [Fri, 5 Jan 2018 12:39:18 +0000 (13:39 +0100)]
README: fix name on CI badges

6 years agouse 1.0.0 for release version to make pypi happy 1.0.0
Hans-Christoph Steiner [Wed, 3 Jan 2018 20:41:35 +0000 (21:41 +0100)]
use 1.0.0 for release version to make pypi happy

6 years agorelease: compile_catalog must be run before register
Hans-Christoph Steiner [Wed, 3 Jan 2018 20:26:39 +0000 (21:26 +0100)]
release: compile_catalog must be run before register

6 years agoBump to 1.0!!
Hans-Christoph Steiner [Wed, 3 Jan 2018 14:52:22 +0000 (15:52 +0100)]
Bump to 1.0!!

6 years agoMerge branch 'weblate' into 'master'
Hans-Christoph Steiner [Wed, 3 Jan 2018 15:40:05 +0000 (15:40 +0000)]
Merge branch 'weblate' into 'master'

Weblate

See merge request fdroid/fdroidserver!430

6 years agoWeblate
Hans-Christoph Steiner [Wed, 3 Jan 2018 15:40:03 +0000 (15:40 +0000)]
Weblate

6 years agoMerge branch 'build-log-data-points' into 'master'
Hans-Christoph Steiner [Wed, 3 Jan 2018 14:39:23 +0000 (14:39 +0000)]
Merge branch 'build-log-data-points' into 'master'

add data points to the build log to add debugging

See merge request fdroid/fdroidserver!429

6 years agoget minimum aapt version from fdroidserver/common.py for CI tests
Hans-Christoph Steiner [Wed, 3 Jan 2018 13:32:16 +0000 (14:32 +0100)]
get minimum aapt version from fdroidserver/common.py for CI tests

6 years agobuild: include buildserverid on wiki build logs, if it exists
Hans-Christoph Steiner [Wed, 3 Jan 2018 12:58:06 +0000 (13:58 +0100)]
build: include buildserverid on wiki build logs, if it exists

When `fdroid build` is run using the buildserver, it should fetch the
buildserverid on the first build.

Seems this was really a silly bug in 837fc99d74f7694a64f014f3d38a8b07d9e8b3bd

6 years agobuild: log the start time of the current build session
Hans-Christoph Steiner [Wed, 3 Jan 2018 11:16:20 +0000 (12:16 +0100)]
build: log the start time of the current build session

Since `fdroid build --all` can run a long time, knowing when that command
was started will be very useful information for figuring out what the build
server is doing.

6 years agojenkins.debian.net is Debian/stretch, its build-tools are too old
Hans-Christoph Steiner [Fri, 29 Dec 2017 15:06:25 +0000 (16:06 +0100)]
jenkins.debian.net is Debian/stretch, its build-tools are too old

6 years agogitlab-ci: and one last stoopid error in debian_testing target
Hans-Christoph Steiner [Fri, 29 Dec 2017 14:49:20 +0000 (15:49 +0100)]
gitlab-ci: and one last stoopid error in debian_testing target

6 years agogitlab-ci: fix syntax error
Hans-Christoph Steiner [Fri, 29 Dec 2017 14:34:57 +0000 (15:34 +0100)]
gitlab-ci: fix syntax error

6 years agogitlab-ci: temp disable some tests on Debian/testing
Hans-Christoph Steiner [Fri, 29 Dec 2017 14:28:51 +0000 (15:28 +0100)]
gitlab-ci: temp disable some tests on Debian/testing

build-tools needs an update before these tests will work again.

6 years agogitlab-ci: set Fedora build to use a supported build-tools version
Hans-Christoph Steiner [Fri, 29 Dec 2017 14:12:36 +0000 (15:12 +0100)]
gitlab-ci: set Fedora build to use a supported build-tools version

Using 25.0.2, not all of the permissions were being output:

--- /builds/fdroid/fdroidserver/tests/repo/index.xml 2017-12-28 22:33:53.624704459 +0000
+++ repo/index.xml 2017-12-28 22:41:52.207849097 +0000
@@ -35,7 +35,6 @@
  <added>2017-12-22</added>
  <sig>2d337e40aef77564bf62781ac424595c</sig>
  <permissions>ACCESS_NETWORK_STATE,ACCESS_WIFI_STATE,CHANGE_WIFI_MULTICAST_STATE,INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE</permissions>
- <uses-permission maxSdkVersion="18" name="android.permission.READ_EXTERNAL_STORAGE"/>
  <uses-permission maxSdkVersion="18" name="android.permission.WRITE_EXTERNAL_STORAGE"/>
  <uses-permission-sdk-23 maxSdkVersion="27" name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
  </package>

6 years agoMerge branch 'ever-more-fixes' into 'master'
Hans-Christoph Steiner [Thu, 28 Dec 2017 22:33:25 +0000 (22:33 +0000)]
Merge branch 'ever-more-fixes' into 'master'

Ever more fixes

Closes #395 and #306

See merge request fdroid/fdroidserver!423

6 years agoMerge branch 'fix_no-refresh' into 'master'
Hans-Christoph Steiner [Thu, 28 Dec 2017 22:08:29 +0000 (22:08 +0000)]
Merge branch 'fix_no-refresh' into 'master'

build: fix --no-refresh

See merge request fdroid/fdroidserver!428

6 years agotests: correct package names in stats/known_apks.txt
Hans-Christoph Steiner [Fri, 22 Dec 2017 22:19:06 +0000 (23:19 +0100)]
tests: correct package names in stats/known_apks.txt

This doesn't seem to affect the tests either way, but it is good to have
things correct there.

6 years agocommon: fix bug in new SHA-256 signatures for >= android-18
Hans-Christoph Steiner [Fri, 22 Dec 2017 16:49:36 +0000 (17:49 +0100)]
common: fix bug in new SHA-256 signatures for >= android-18

Luckily, this is only used in `fdroid nightly` so far.

6 years agoaapt 26.0.0 is required to properly parse permissions and label
Hans-Christoph Steiner [Fri, 22 Dec 2017 16:28:25 +0000 (17:28 +0100)]
aapt 26.0.0 is required to properly parse permissions and label

#236

closes #395
aapt 26.0.0 outputs the permissions correctly

closes #306
aapt 26.0.0 now outputs:  application-label:'K-9 Mail'

6 years agonightly: support arbitrary keystore files for setup
Hans-Christoph Steiner [Thu, 21 Dec 2017 11:16:06 +0000 (12:16 +0100)]
nightly: support arbitrary keystore files for setup

GitHub only allows an SSH key to be used as a Deploy Key for a single repo.
That means, each nightly build repo on GitHub/Travis must have its own
debug keystore.

6 years agojenkins: try to prevent the build node from running out of disk space
Hans-Christoph Steiner [Thu, 28 Dec 2017 21:51:55 +0000 (22:51 +0100)]
jenkins: try to prevent the build node from running out of disk space

6 years agoMerge branch 'master' into 'master'
Marcus [Wed, 27 Dec 2017 19:31:50 +0000 (19:31 +0000)]
Merge branch 'master' into 'master'

gradle file: use flavour specific versionCode/versionName, fall back to parsing line by line

See merge request fdroid/fdroidserver!426

6 years agoAdd Nextcloud and DavDroid test case
mimi89999 [Sun, 24 Dec 2017 10:55:56 +0000 (11:55 +0100)]
Add Nextcloud and DavDroid test case