1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-05 06:50:10 +01:00
Commit Graph

5243 Commits

Author SHA1 Message Date
Michael Pöhn
55466f1166 fix fixtures in tests/metadata/dump 2018-08-07 00:02:07 +02:00
Michael Pöhn
5d5617bf40 fix: minor bugs in testcases for: common, metadata, update 2018-08-06 23:53:49 +02:00
Michael Pöhn
28ec93c587 fix: run all testcase in tests/run-tests 2018-08-06 23:53:49 +02:00
Hans-Christoph Steiner
a01d11ba64 Merge branch '530-lint-issue-with-disable' into 'master'
Resolve "Lint issues with 'disable: ...` in YAML"

Closes #530

See merge request fdroid/fdroidserver!550
2018-08-03 09:07:09 +00:00
Hans-Christoph Steiner
09d507839b Merge branch '513-set-locale-explicitly-when-using-keytool' into 'master'
Resolve "fdroidserver fails on MacOSX while init"

Closes #513

See merge request fdroid/fdroidserver!551
2018-08-03 09:04:23 +00:00
Michael Pöhn
74ae6a6a3b set locale explicitly when using keytool 2018-08-03 04:36:00 +02:00
Michael Pöhn
14730be812 bump RELEASE_COMMIT_ID for fixing metadata_v0 test 2018-08-02 18:18:07 +02:00
Michael Pöhn
1e7d9b854d never interpret "disable" as bool in yaml metadata 2018-08-02 17:31:58 +02:00
Michael Pöhn
545872f184 Merge branch 'patch-1' into 'master'
Lint - the error should hint that the right word is `Categories`

See merge request fdroid/fdroidserver!543
2018-07-30 22:56:57 +00:00
Licaon_Kter
da0c541dec Lint - the error should hint that the right word is Categories 2018-07-30 22:56:57 +00:00
Michael Pöhn
bd1af5d07e Merge branch 'signatures-clean-up-globals' into 'master'
clean up globals in signatures.py

See merge request fdroid/fdroidserver!545
2018-07-30 21:11:31 +00:00
Marcus
5e6cb548af Merge branch 'gradle_4.9' into 'master'
add gradle 4.9

See merge request fdroid/fdroidserver!546
2018-07-30 21:10:11 +00:00
Marcus Hoffmann
91a7b91845 add gradle 4.9 2018-07-30 22:54:09 +02:00
Michael Pöhn
27d382e1f4 clean up globals in signatures.py 2018-07-30 13:07:07 +02:00
Michel Le Bihan
44f21fbf15 Merge branch 'signatures_argument_error' into 'master'
signatures: Don't pass config to extract

Closes #536

See merge request fdroid/fdroidserver!544
2018-07-29 16:02:56 +00:00
mimi89999
d76c5dc859
signatures: Don't pass config to extract
Closes #536
2018-07-29 17:45:45 +02:00
Hans-Christoph Steiner
481a6274f0 Merge branch 'archive_icons' into 'master'
update: populate app level info for archive only from archived apks

Closes #365

See merge request fdroid/fdroidserver!537
2018-07-27 13:09:13 +00:00
Marcus
2aaa097962 Merge branch 'fix_532' into 'master'
Fix 532

Closes #532

See merge request fdroid/fdroidserver!541
2018-07-25 18:11:56 +00:00
Marcus Hoffmann
753e9c8175 scanner: properly combine all gradle compile commands with flavors 2018-07-25 19:00:34 +02:00
Marcus Hoffmann
c44ab190bd scanner: fix reformatting fail
This was broken by 44e8f425d :-(.
2018-07-25 19:00:37 +02:00
Marcus
797958c0b1 Merge branch 'build_tools_28.0.1' into 'master'
makebuildserver: add newest build tools

See merge request fdroid/fdroidserver!539
2018-07-25 15:53:18 +00:00
Marcus Hoffmann
2e77392005 makebuildserver: add newest build tools 2018-07-25 17:20:25 +02:00
Marcus Hoffmann
957b6b8d19
update: populate app level info for archive only from archived apks
Fixes fdroid/fdroidserver#365
2018-07-19 10:44:14 +02:00
Hans-Christoph Steiner
e8306fbde0 Merge branch 'master' into 'master'
fixes for `fdroid update` when dealing with lots of random APKs

Closes #515

See merge request fdroid/fdroidserver!536
2018-07-18 15:32:35 +00:00
Hans-Christoph Steiner
60ee69b8bd gitlab-ci: pylint<2.0 workaround to avoid typed-ast's gcc requirement
To keep those tests light and small, no gcc please!
* https://gitlab.com/eighthave/fdroidserver/-/jobs/82274815
2018-07-18 17:11:21 +02:00
Hans-Christoph Steiner
84dfd6b06a update: more reliable handling of XMLNS with androguard
Sometimes androguard returns the XMLNS as entirely empty, which would make
it an invalid APK since normally the 'android' name is mapped to the
'http://schemas.amazon.com/apk/res/android' value.  Occasionally, a
different key is used.

closes fdroid/fdroidserver#515
2018-07-17 12:37:13 +02:00
Hans-Christoph Steiner
4352aa2792 update: pass resourceIds through if they can't be deferenced
People do odd tricks with `aapt --rename-manifest-package` and androguard
doesn't handle them all.

* https://github.com/androguard/androguard/issues/503
2018-07-17 12:37:13 +02:00
Hans-Christoph Steiner
0e0a5019ab update: little trick to avoid some cases of XML app icons
refs #344
2018-07-17 12:37:13 +02:00
Hans-Christoph Steiner
75e9a9e176 update: support versionCode values in hex 2018-07-17 12:37:13 +02:00
Hans-Christoph Steiner
c8e61aa02d update: handle random drawable folder names when parsing icons
The app com.android.acehk.aceapp37423 had this invalid stuff in it:

     6165  2014-03-28 12:52   res/drawable-320dpi/ic_launcher.png
2018-07-17 12:37:13 +02:00
Hans-Christoph Steiner
a9cc7f6358 update translation template with latest strings 2018-07-17 12:37:13 +02:00
Hans-Christoph Steiner
56a5d868f1 update: purge --editor and --interactive, they were removed in 2013
48296df5b0
2018-07-17 12:37:13 +02:00
Hans-Christoph Steiner
be54f1e82a Merge branch 'improve_gradlew-fdroid' into 'master'
Improve gradlew fdroid

See merge request fdroid/fdroidserver!535
2018-07-13 16:53:50 +00:00
Marcus Hoffmann
7023f372fd gradlew-fdroid: tabs -> spaces
We have everything indented with spaces. Don't make an exception for
shell scripts.
2018-07-13 17:02:48 +02:00
Marcus Hoffmann
03e9fe4b38 gradlew-fdroid: save downloads with proper name
This makes re-using them for makebuildserver possible
2018-07-13 17:01:14 +02:00
Marcus Hoffmann
51ef9a8a99 gradlew-fdroid; print which gradle binary is actually running 2018-07-13 17:00:45 +02:00
Marcus
449b4ef7a2 Merge branch 'fix_519' into 'master'
Fix 519

Closes #519

See merge request fdroid/fdroidserver!534
2018-07-13 14:28:36 +00:00
Marcus Hoffmann
19a017c88d gradlew-fdroid: don't print available versions
It's not really useful information and can be gathered from the used
fdroidserver commit in any case.
2018-07-13 16:03:38 +02:00
Marcus Hoffmann
377c50fc53 gradlew-fdroid: make sure cachedir exists
Closes fdroid/fdroidserver#519
2018-07-13 16:02:58 +02:00
Michael Pöhn
b6ad6724cc Revert "publish: avoid double removal of dev-supplied reference binary"
This reverts commit db5ed26517.

Doh, messed up the rebase...
2018-07-13 00:07:58 +02:00
Hans-Christoph Steiner
b0e9a25abd Merge branch 'subdir-for-reprod-apks' into 'master'
put .binary.apk files into sub-directory

another shot at #509

See merge request fdroid/fdroidserver!533
2018-07-12 23:53:37 +02:00
Hans-Christoph Steiner
64b999ca19 publish: test case that successfully verifies based on Binaries:
This is a stupid test of the process just to exercise the most basic path.
It should always succeed since it is verifying two copes of the same APK.
2018-07-12 23:53:05 +02:00
Hans-Christoph Steiner
58b81b5ca6 publish: strict regex replacement for .binary.apk
. matches anything \. matches the char "."
2018-07-12 23:53:05 +02:00
Hans-Christoph Steiner
68fb3d2bd9 fix typos 2018-07-12 23:53:05 +02:00
Michael Pöhn
db5ed26517 publish: avoid double removal of dev-supplied reference binary 2018-07-12 23:53:05 +02:00
Michael Pöhn
cdc2147de9 put .binary.apk files into sub-directory 2018-07-12 23:52:46 +02:00
Michael Pöhn
fab02a49dc Merge branch 'better_gradle_support' into 'master'
Better gradle support

Closes #98

See merge request fdroid/fdroidserver!527
2018-07-11 15:20:19 +00:00
Marcus Hoffmann
34b698aa45
hooks: add gradlew-fdroid to BASH_FILES 2018-07-11 11:49:41 +02:00
Marcus Hoffmann
9889a98dea
build: improve gradle experience
This expands the gradle wrapper shell script used by the buildserver for
usage outside the buildserver environment. It also allows downloading
whitelisted versions of gradle if they are not yet deployed to the
buildserver by simply upsating the copy of fdroidserver (in contrast to
having to reprovision the whole buildserver).

We first move the buildserver/gradle shell script to the repo root
as gradlew-fdroid, as it's an fdroid specific gradle wrapper.
We also now sync it inside the build VM before each build.

We then add a list of whitelisted gradle distributions taken from the
makebuildserver script.

The script additionally now reads two env vars which tell it where to
expect installed versions of gradle and where it might store downloaded
gradle .zip files. Both of those are configurable from config.py. As the
first should normally just be a subdir of the second it's not exposed in
the example config.py but only used by the buildserver config.py.

Default config now uses this internal gradle wrapper but a path to a
custom wrapper or specific gradle distribution can still be set from
config.py.

Closes fdroid/fdroidserver#98
Ref: fdroid/fdroidserver#370
2018-07-11 11:49:46 +02:00
Hans-Christoph Steiner
7dae36399d Merge branch 'master' into 'master'
NoSourceSince Anti-Feature should only be added to index

See merge request fdroid/fdroidserver!532
2018-07-10 22:10:09 +00:00