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

5615 Commits

Author SHA1 Message Date
Michael Pöhn
12af173821 fix left out refactoring in build.py 2018-06-23 23:26:42 +02:00
Hans-Christoph Steiner
3e62b29e96 Merge branch 'master' into 'master'
two fixes and two new flags for `fdroid nightly

Closes #288

See merge request fdroid/fdroidserver!519
2018-06-20 14:32:02 +00:00
Hans-Christoph Steiner
1d6c462605 Merge branch '495-publish-build-logs-with-rsync' into 'master'
publish build logs with rsync

See merge request fdroid/fdroidserver!515
2018-06-19 13:44:09 +00:00
Hans-Christoph Steiner
a736a37282 update: let it work without JDK, only JRE and apksigner 2018-06-19 15:40:48 +02:00
Hans-Christoph Steiner
8f2ee4bd1d run 'zipalign' using standard flags used by Gradle Android Plugin
Nice find by @equeim!  -p was added in build-tools-23.0.0

https://developer.android.com/studio/publish/app-signing#sign-manually

closes #288
2018-06-19 15:40:48 +02:00
Hans-Christoph Steiner
deccd013c9 nightly: --no-deploy option to skip rsyncing repo 2018-06-19 15:40:48 +02:00
Hans-Christoph Steiner
881074b2aa nightly: --keep-private-keys option to allow further processing
This makes it possible to run `fdroid server update` after `fdroid nightly`
has completed.  It also actually deletes all private key files.
2018-06-19 15:40:48 +02:00
Hans-Christoph Steiner
672df07238 Merge branch 'conform-vmtools-coding-style' into 'master'
refactor vmtools logging, pythonic binary lookup

See merge request fdroid/fdroidserver!518
2018-06-19 13:22:28 +00:00
Michael Pöhn
752f6a4ba2 applied review suggestions for deploying (build) logs 2018-06-19 15:18:13 +02:00
Michael Pöhn
a318a637a5 vmtools: use pythonic way to check for installed binaries 2018-06-19 14:47:03 +02:00
Michael Pöhn
ebe71472d3 use default logging style in vmtools 2018-06-19 14:37:18 +02:00
Michael Pöhn
763768989b add additional infos about publish_build_logs to example/config.py 2018-06-19 12:39:37 +02:00
Michael Pöhn
88e64df3ef deploying build logs to server after each individual build run 2018-06-19 12:24:52 +02:00
Michael Pöhn
4c53c71fcf added helper function for uploading build logs with rsync 2018-06-19 12:24:52 +02:00
Michael Pöhn
af980fbe7e added tests for update_serverwebroot 2018-06-19 12:24:52 +02:00
Michael Pöhn
429bc21da7 make common.TestCase run independant of cwd 2018-06-19 12:24:52 +02:00
Marcus
26996b0128 Merge branch 'gradle-4.8' into 'master'
makebuildserver: add Gradle 4.8

See merge request fdroid/fdroidserver!517
2018-06-14 17:55:48 +00:00
relan
396ef24a4d makebuildserver: add Gradle 4.8 2018-06-14 20:37:54 +03:00
Marcus
4b342c7cb5 Merge branch '498' into 'master'
scanner: whitelist www.jitpack.io

Closes #498

See merge request fdroid/fdroidserver!516
2018-06-11 10:55:39 +00:00
Marcus Hoffmann
3a6942ca77
scanner: whitelist www.jitpack.io
Only the non-www version was recognized so far.

Closes #498
2018-06-11 12:40:55 +02:00
Marcus
a65bc96f51 Merge branch '496-makebuildserver-does-not-handle-basebox-with-multiple-architectures-correctly' into 'master'
Resolve "makebuildserver does not handle basebox with multiple architectures correctly"

Closes #496

See merge request fdroid/fdroidserver!513
2018-06-05 07:30:51 +00:00
Michael Pöhn
6266c33027 makebuildserver: fix lookup logic for needs_mutate 2018-06-05 00:03:17 +02:00
Hans-Christoph Steiner
e8bad73ae4 Merge branch 'master' into 'master'
modernize PEP8 checks to prepare for Python 3.7

See merge request fdroid/fdroidserver!512
2018-05-29 12:14:15 +00:00
Hans-Christoph Steiner
ff90c0246e fix PEP8 W605 invalid escape sequence
Python 3.7 will get a lot stricter with escape sequences.  They must be
valid.

* https://lintlyci.github.io/Flake8Rules/rules/W605.html
* https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
2018-05-29 13:51:47 +02:00
Hans-Christoph Steiner
e6d5260c3c fix PEP8: W504 line break after binary operator 2018-05-29 12:31:56 +02:00
Hans-Christoph Steiner
8c4f75e05f pre-commit hook: use most compatible grep flags
The minimal test suite runs on Alpine use busybox grep, and BSD grep also
often has different flags.
2018-05-29 11:28:08 +02:00
Hans-Christoph Steiner
a87df29135 gitlab-ci: pep8 has been replaced by pycodestyle 2018-05-29 11:28:08 +02:00
Marcus
4b3b14ca82 Merge branch 'cleanup-platform27' into 'master'
remove platform-27_r01

See merge request fdroid/fdroidserver!511
2018-05-28 14:17:48 +00:00
Marcus Hoffmann
e0f54ff995
remove platform-27_r01
Superseded by r03.
2018-05-28 16:04:38 +02:00
Hans-Christoph Steiner
e180e03a5a tests: fix index-v1.json unicode test 2018-05-28 09:29:11 +02:00
Hans-Christoph Steiner
c37c8bc0a5 bump to 1.0.6 2018-05-25 17:29:14 +02:00
Hans-Christoph Steiner
91068d8e00 tests: rename unicode test file to fix "file name too long" errors
pristine-tar and mkdir barf on this file.
2018-05-25 17:27:58 +02:00
Hans-Christoph Steiner
e986dcf985 directly use README.md for pypi, using new metadata options
* https://packaging.python.org/tutorials/packaging-projects/#description
* https://packaging.python.org/specifications/core-metadata/#description-content-type-optional
* https://blog.thea.codes/github-flavored-markdown-on-pypi/
2018-05-25 14:23:05 +02:00
Hans-Christoph Steiner
dae73be4ab bump to 1.0.5 2018-05-25 13:53:09 +02:00
Hans-Christoph Steiner
6c64b68c7e Merge branch 'weblate' into 'master'
Weblate

See merge request fdroid/fdroidserver!510
2018-05-25 11:36:15 +00:00
Hans-Christoph Steiner
19d59ae655 Weblate 2018-05-25 11:36:15 +00:00
Torsten Grote
8231042699 Merge branch 'polish-verification.f-droid.org-setup' into 'master'
Polish verification.f droid.org setup

See merge request fdroid/fdroidserver!509
2018-05-25 10:59:32 +00:00
Hans-Christoph Steiner
fb02073cab fix "local variable 'e' is assigned to but never used" 2018-05-25 12:32:34 +02:00
Hans-Christoph Steiner
14127bf418 gitlab-ci: combine all lint/syntax/safety checks into a single job
This should make it easier to accept merge requests where there are only
cosmetic problems with them.  pep8/pylint/pyflakes runs can then be disabled
in the 'test' job by not installing the in the ci-images-server base image.
2018-05-25 12:12:40 +02:00
Hans-Christoph Steiner
5ff1b5ef37 verify: exit with error code if any APK fails to verify 2018-05-25 11:56:13 +02:00
Hans-Christoph Steiner
a3a0b8dcf0 verify: --reuse-remote-apk to reuse local APKs
For something like a verification server, this avoids having `fdroid verify`
redownload the remote APK from f-droid.org every time its run.  For normal
users, it should download a fresh copy each time to avoid false errors
based on confusion over anything that might have changed the local copy of
the remote APK.

This patch has been used on verification.f-droid.org for a while now. It is
the last thing keeping verification.f-droid.org from using fdroidserver
straight from stretch-backports.
2018-05-25 11:48:01 +02:00
Hans-Christoph Steiner
b0a5ec5c1a workaround crash in diffoscope when verifying APKs
On versions of diffoscope before 87, like the version included in Ubuntu
xenial LTS, it would crash saying:

ValueError: max_diff_block_lines (100) cannot be smaller than max_page_diff_block_lines (128)

https://bugs.debian.org/875451
2018-05-25 11:48:01 +02:00
Hans-Christoph Steiner
5afba57212 Merge branch 'fix-tests' into 'master'
Fix tests and polish release

See merge request fdroid/fdroidserver!508
2018-05-25 08:51:18 +00:00
Hans-Christoph Steiner
0a15a9b65b tests: fix and test fdroid deploy 2018-05-25 10:32:09 +02:00
Hans-Christoph Steiner
1daa1063c5 tests: keep strerr totally clean on successful runs
Debian's autopkgtest defaults to considering any output on stderr as a sign
that the tests failed.  it is simple to make this achieve that standard, so
it seems worth it for now at least.
2018-05-25 10:32:01 +02:00
Hans-Christoph Steiner
002a4ae50e fix including unicode test APK in source tarball 2018-05-25 10:32:01 +02:00
Hans-Christoph Steiner
cef73e5794 remove unused variable, as reported by pyflakes 2018-05-25 10:32:01 +02:00
Hans-Christoph Steiner
74fb07b302 gitlab-ci: switch pyup_io_safety_check to Alpine to be lighter 2018-05-25 09:54:08 +02:00
Hans-Christoph Steiner
00971941fd Merge branch 'reproducible-bug' into 'master'
Fix reproducible builds

See merge request fdroid/fdroidserver!505
2018-05-24 19:32:46 +00:00
Torsten Grote
c6f3aed003
Fix reproducible builds
This commit fixes two bugs with reproducible builds:
* Files added by the buildserver to META-INF (fdroidserverid and buildserverid)
  were causing signature verification to always fail when --on-server was used.
  Since they are not needed anymore, they are no longer added to APKs.
* When showing a diff between both APK files, `jar xf` did not extract
  the full APK properly which was causing useless diffs.
  Instead of using jar, python's zipfile library is used instead.
2018-05-24 16:09:10 -03:00