1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 00:40:11 +01:00
Commit Graph

5323 Commits

Author SHA1 Message Date
Hans-Christoph Steiner
c4dbc58d10 build: buildserverid must always be str not bytes 2018-01-11 14:09:12 +01:00
Hans-Christoph Steiner
87524622ea 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
2018-01-11 12:50:18 +01:00
Hans-Christoph Steiner
3a792a8c3d Merge branch 'cleaner-clean' into 'master'
build: clean up only known subdirectories in build/*

Closes #438

See merge request fdroid/fdroidserver!432
2018-01-10 19:14:49 +00:00
relan
e29be52da0 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.
2018-01-10 21:45:26 +03:00
Marcus
784e456cc6 Merge branch 'gradle-4.4.1' into 'master'
makebuildserver: add Gradle 4.4.1

See merge request fdroid/fdroidserver!433
2018-01-10 18:40:36 +00:00
relan
70fba5d08c makebuildserver: add Gradle 4.4.1 2018-01-10 21:31:59 +03:00
Hans-Christoph Steiner
4e9ff9570d Merge branch 'master' into 'master'
new script to audit the FDroid.apk on https://f-droid.org

See merge request fdroid/fdroidserver!431
2018-01-05 13:47:48 +00:00
Hans-Christoph Steiner
dfbe114af3 new script to audit the FDroid.apk on https://f-droid.org
This makes sure its signed by the F-Droid key.
2018-01-05 14:08:14 +01:00
Hans-Christoph Steiner
0baa163b01 README: fix name on CI badges 2018-01-05 13:39:18 +01:00
Hans-Christoph Steiner
6d69dcddd9 use 1.0.0 for release version to make pypi happy 2018-01-03 21:41:35 +01:00
Hans-Christoph Steiner
6ad02bc4ec release: compile_catalog must be run before register 2018-01-03 21:26:39 +01:00
Hans-Christoph Steiner
d95859c87e Bump to 1.0!! 2018-01-03 16:51:16 +01:00
Hans-Christoph Steiner
62a0d85e9a Merge branch 'weblate' into 'master'
Weblate

See merge request fdroid/fdroidserver!430
2018-01-03 15:40:05 +00:00
Hans-Christoph Steiner
7d5d5b0999 Weblate 2018-01-03 15:40:03 +00:00
Hans-Christoph Steiner
4aaf82c34c Merge branch 'build-log-data-points' into 'master'
add data points to the build log to add debugging

See merge request fdroid/fdroidserver!429
2018-01-03 14:39:23 +00:00
Hans-Christoph Steiner
fba4fa6ca6 get minimum aapt version from fdroidserver/common.py for CI tests 2018-01-03 14:54:30 +01:00
Hans-Christoph Steiner
54965455b1 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 837fc99d74
2018-01-03 13:58:06 +01:00
Hans-Christoph Steiner
444ae95380 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.
2018-01-03 12:29:29 +01:00
Hans-Christoph Steiner
9793e57302 jenkins.debian.net is Debian/stretch, its build-tools are too old 2017-12-29 16:06:45 +01:00
Hans-Christoph Steiner
c8e32c2802 gitlab-ci: and one last stoopid error in debian_testing target 2017-12-29 16:06:45 +01:00
Hans-Christoph Steiner
c7762ad7d7 gitlab-ci: fix syntax error 2017-12-29 15:35:04 +01:00
Hans-Christoph Steiner
6816ef15dd gitlab-ci: temp disable some tests on Debian/testing
build-tools needs an update before these tests will work again.
2017-12-29 15:29:28 +01:00
Hans-Christoph Steiner
b70ede6761 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>
2017-12-29 15:12:49 +01:00
Hans-Christoph Steiner
463a1b5376 Merge branch 'ever-more-fixes' into 'master'
Ever more fixes

Closes #395 and #306

See merge request fdroid/fdroidserver!423
2017-12-28 22:33:25 +00:00
Hans-Christoph Steiner
76f20da9e8 Merge branch 'fix_no-refresh' into 'master'
build: fix --no-refresh

See merge request fdroid/fdroidserver!428
2017-12-28 22:08:29 +00:00
Hans-Christoph Steiner
6d32b68016 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.
2017-12-28 23:07:26 +01:00
Hans-Christoph Steiner
e451ec0079 common: fix bug in new SHA-256 signatures for >= android-18
Luckily, this is only used in `fdroid nightly` so far.
2017-12-28 23:07:26 +01:00
Hans-Christoph Steiner
109eb928e8 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'
2017-12-28 23:07:26 +01:00
Hans-Christoph Steiner
01f3d071ee 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.
2017-12-28 23:07:26 +01:00
Hans-Christoph Steiner
8ed6bb8506 jenkins: try to prevent the build node from running out of disk space 2017-12-28 22:51:55 +01:00
Marcus
195a1bbae4 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
2017-12-27 19:31:50 +00:00
mimi89999
455dcc34d8
Add Nextcloud and DavDroid test case 2017-12-27 11:51:57 +01:00
Marcus Hoffmann
e775d330c2
build: fix --no-refresh
This was broken by the in-source-tree .fdroid.yml file support.
Also support this for building on the buildserver.
2017-12-26 00:20:17 +01:00
Marcus
6069cad027 Merge branch 'platform-27' into 'master'
makebuildserver: remove platform-27

See merge request fdroid/fdroidserver!427
2017-12-24 18:39:01 +00:00
Marcus Hoffmann
14657f2642
makebuildserver: remove platform-27
The hash changes all the time and gradle will install this on the fly
anyway when missing.
2017-12-24 18:51:28 +01:00
mimi89999
90c7dd29df
gradle file: use flavour specific versionCode/versionName, fall back to parsing line by line 2017-12-23 17:12:54 +01:00
Michel Le Bihan
5cfa4d487f Merge branch 'master' into 'master'
Revert: gradle file: use flavour specific versionCode/versionName, fall back to…

See merge request fdroid/fdroidserver!425
2017-12-23 12:01:12 +00:00
mimi89999
918bd15c45
Revert: gradle file: use flavour specific versionCode/versionName, fall back to parsing line by line 2017-12-23 12:57:34 +01:00
Marcus
8c243ee7eb Merge branch 'limit-build-all' into 'master'
build: limit --all to 10 apps at a time

See merge request fdroid/fdroidserver!420
2017-12-22 13:09:16 +00:00
Hans-Christoph Steiner
69dc3cc9ce Merge branch 'typo' into 'master'
Fix a typo in vmtools.py

See merge request fdroid/fdroidserver!421
2017-12-22 08:50:49 +00:00
Pierre Rudloff
ebfb35f1f7 Fix a typo in vmtools.py 2017-12-22 00:14:29 +00:00
Hans-Christoph Steiner
afc5cc6b6a build: limit --all to 10 apps at a time
This needed now because the buildserver is hanging so often, that we are
often going a week or more without any builds published.  Perhaps this is
only temporary, or maybe we will want to flush this feature out more as a
standard thing.  But we really need it for now to at least get some builds
out on a daily basis.

Since the website deploy is also triggered by this cycle, making the build
finish more often means the website will be published more often.
2017-12-21 23:15:34 +01:00
Hans-Christoph Steiner
c29d135de1 Merge branch 'additional_tests' into 'master'
readme: add note about additional CI tests

See merge request fdroid/fdroidserver!419
2017-12-21 09:18:13 +00:00
Marcus Hoffmann
2b43413df8
readme: add note about additional CI tests
[ci-skip]
2017-12-21 00:56:42 +01:00
Hans-Christoph Steiner
5f9bfe48ff Merge branch 'nail-down-tests' into 'master'
Nail down tests

Closes #432

See merge request fdroid/fdroidserver!418
2017-12-20 23:16:03 +00:00
Hans-Christoph Steiner
80844832a8 travis-ci: install babel with pip to stop easy_install
easy_install just fails, trying to install into ./.eggs
https://travis-ci.org/fdroidtravis/fdroidserver/jobs/319144754
2017-12-20 23:46:37 +01:00
Hans-Christoph Steiner
8a58ee72e3 travis-ci: include new android-sdk-license on OSX 2017-12-20 23:46:37 +01:00
Hans-Christoph Steiner
173a35b190 tests: only generate keystores when that is actually being tested
Generating a keystore is quite slow since it means a new RSA key is created.
That only needs to happen in the tests that check that it actually happened,
otherwise the test can just reuse the stored test keystore.

closes #432
2017-12-20 23:46:37 +01:00
Hans-Christoph Steiner
eb81eaa574 README: document test suite (closes #432) 2017-12-20 23:46:37 +01:00
Hans-Christoph Steiner
7fcb4da0e6 travis-ci: show sdkmanager logs 2017-12-20 23:46:37 +01:00