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

7388 Commits

Author SHA1 Message Date
Marcus
4effc74c2b Merge branch 'gradle-5.1' into 'master'
makebuildserver: add Gradle 5.1 and 5.1.1

See merge request fdroid/fdroidserver!609
2019-01-16 08:50:07 +00:00
relan
56620177aa makebuildserver: add Gradle 5.1 and 5.1.1 2019-01-16 07:25:25 +03:00
Michael von Glasow
f8f17a430d Reword warning message about sudo commands being skipped 2019-01-15 14:14:09 +00:00
Michael von Glasow
868516f3fd Clarify warning message about skipped sudo commands 2019-01-15 12:36:17 +00:00
Francesco Cervigni
984d276c1b Added test aapt output files for build-tools 28.0.3 2019-01-13 19:27:02 +01:00
Marcus Hoffmann
a5ec1703c9 Revert "lint: check if CurrentVersion is older than oldest build entry"
This reverts commit 78473e7dab.

This is currently blocked by some apps in fdroiddata being reset to a
broken state.
2019-01-10 14:48:52 +01:00
Marcus Hoffmann
e1c547cfdf Revert "Revert "Merge branch 'random-fixes' into 'master'""
This reverts commit f6f2fb0b89.

Only one of the included commit should have been reverted.
2019-01-10 14:48:29 +01:00
Marcus
f6f2fb0b89 Revert "Merge branch 'random-fixes' into 'master'"
This reverts merge request !605
2019-01-10 13:46:49 +00:00
Francesco Cervigni
64445520b0 update.py: Still aapt output parsing, setting regex to catch 'name=' without prefixes, needed for build-tools 28.0.3
build-tools 28.0.3 added a new field in the end 'compileSdkVersionCodename=', which also accidentally ends with the string 'name='.
The purpose of this regex was to catch the 'packageName' field, which is in ht eaapt ouput the exact ' name=', therefore added whe non-caracter \W prefix match.

sample aapt output (28.0.3):
package: name='com.a.b.app' versionCode='1' versionName='1.0' compileSdkVersion='28' compileSdkVersionCodename='9'

previously, regex was catching second occurence, so '9'

See merge request !582
2019-01-08 22:46:47 +01:00
Hans-Christoph Steiner
357dea762d Merge branch 'random-fixes' into 'master'
random fixes

See merge request fdroid/fdroidserver!605
2019-01-03 20:29:01 +00:00
Hans-Christoph Steiner
13bcc476a7 androguard>=3.3 fails: "AXMLParser' object has no attribute 'is_valid'"
Traceback (most recent call last):
  File "/builds/eighthave/fdroidserver/tests/build.TestCase", line 120, in test_get_apk_metadata
    vc, vn = fdroidserver.build.get_metadata_from_apk(app, build, apkfilename)
  File "/builds/eighthave/fdroidserver/fdroidserver/build.py", line 332, in get_metadata_from_apk
    appid, versionCode, versionName = common.get_apk_id(apkfile)
  File "/builds/eighthave/fdroidserver/fdroidserver/common.py", line 2126, in get_apk_id
    return get_apk_id_androguard(apkfile)
  File "/builds/eighthave/fdroidserver/fdroidserver/common.py", line 2158, in get_apk_id_androguard
    while axml.is_valid():
AttributeError: 'AXMLParser' object has no attribute 'is_valid'
2019-01-03 21:00:01 +01:00
Hans-Christoph Steiner
76b026e572 lint: check whether the locale was included in an f-droid.org URL 2019-01-03 21:00:01 +01:00
Hans-Christoph Steiner
78473e7dab lint: check if CurrentVersion is older than oldest build entry
This causes F-Droid to never install this app, except for manually via the
Versions list in AppDetails.
2019-01-03 21:00:01 +01:00
Hans-Christoph Steiner
4c5864c975 buildserver: add config option to use 'nfs' instead of '9p'
'9p' is not possible when running KVM in VMware.  Also, 'nfs' might provide
more reliably operation on systems that are properly setup for it.
2019-01-03 21:00:01 +01:00
Hans-Christoph Steiner
a2aef721d8 add timeout to net.http_get() and index.download_repo_index()
The requests docs recommend this:
http://docs.python-requests.org/en/master/user/quickstart/#timeouts

And mirror-monitor was hanging forever on a bad mirror.
2019-01-03 20:26:40 +01:00
Hans-Christoph Steiner
9c900ed63c Merge branch 'fix-virustotal-from-mirror' into 'master'
Fix virustotal from mirror

See merge request fdroid/fdroidserver!604
2019-01-03 19:26:01 +00:00
Marcus Hoffmann
e6388285fd add gradle 4.10.3 2018-12-23 18:07:20 +01:00
Hans-Christoph Steiner
33b097a3aa deploy: upload to VirusTotal using index-v1.json or index-v1.jar
* A mirror of the repo will have only index-v1.jar.
* A buildserver with separate signing might have only index-v1.json
2018-12-17 14:33:02 +01:00
Hans-Christoph Steiner
869cc114a3 create index.get_index_from_jar() for parsing index-v1.json
Also removes redundant comments, should be in the doc string!
2018-12-17 14:30:05 +01:00
Hans-Christoph Steiner
09281bee25 Merge branch 'disable-auto-updates-on-buildserver' into 'master'
buildserver: disable all automatic apt-get updates

Closes #437

See merge request fdroid/fdroidserver!603
2018-12-12 19:37:15 +00:00
Hans-Christoph Steiner
d6545732e4 buildserver: disable all automatic apt-get updates
Prevents errors due to:
dpkg: error: dpkg status database is locked by another process

closes #437
2018-12-12 17:38:26 +01:00
Hans-Christoph Steiner
076f885950 Merge branch 'verification-fixes' into 'master'
verification fixes

See merge request fdroid/fdroidserver!602
2018-12-10 16:46:46 +00:00
Hans-Christoph Steiner
13016c5d63 verify: add --output-json option to generate status reports
This has to do custom dict/encoder/decoder tricks in order to make sure
that each run of `fdroid verify` on the same files doesn't add duplicate
entries.
2018-12-07 13:13:10 +01:00
Hans-Christoph Steiner
e85256e248 verify: rename var remoteapk to remote_apk to fit other style 2018-12-07 11:19:26 +01:00
Hans-Christoph Steiner
fa7c59eea1 buildserver: include disorderfs to avoid sudo: in metadata
Right now, the only thing that Briar needs in sudo: in order to be built
reproducibly is `apt-get install disorderfs`.  This includes it in the
standard image to make it easy to spread that technique to many builds.

@grote
2018-12-06 21:55:02 +01:00
Hans-Christoph Steiner
47e8c9d436 README: point travis badges to fdroidtravis until f-droid mirror returns
@patcon setup https://github.com/f-droid to mirror the official gitlab
repos.  For some unknown reason, Travis stopped building new commits coming
into that repo about 3 months ago.  This switches to a github.com that I
manually push to, and Travis still builds.

Please switch back to the automatic mirror once it works again.
2018-12-06 14:36:47 +01:00
Hans-Christoph Steiner
78cd2b84ce travis-ci: add missing dependency: python3-defusedxml 2018-12-06 14:05:54 +01:00
Hans-Christoph Steiner
51d961630b fix aapt scraping of <uses-permission> with maxSdkVersion
3e0d1beb09 changed this logic a bit, and it
wasn't quite right.  Then changing the SDK Versions to integers everywhere
seemed to bring this out more.
2018-12-06 13:42:45 +01:00
Hans-Christoph Steiner
653d5fbd88 update: fix running on trusty and things with old PIL/Pillow 2018-12-06 12:49:48 +01:00
Hans-Christoph Steiner
9a524fa85d bump RELEASE_COMMIT_ID for fixing metadata_v0 test
fdroid/fdroidserver!564
2018-12-06 12:30:46 +01:00
Hans-Christoph Steiner
e10c12ffc4 gitlab-ci: fix tests on Fedora
* install `which` and `find` commands used in ./tests/run-tests
* sdkmanager on Fedora needs JAVA_HOME to be set
2018-12-06 12:15:27 +01:00
Michael Pöhn
4655e2e24e Merge branch '427-yml-rewritemeta-produces-unreadble-output-for-multiline-scripts' into 'master'
Resolve "yml rewritemeta produces unreadble output for multiline scripts"

Closes #427

See merge request fdroid/fdroidserver!564
2018-12-05 19:50:59 +00:00
Michael Pöhn
31ca2092a1 yaml parsing: script build flags can now be lists 2018-11-29 21:53:37 +01:00
Michael Pöhn
c15a7508e7 write yaml script metadata as lists 2018-11-29 21:53:37 +01:00
Michael Pöhn
a21635ae2e fix metadata test case: write yaml prebuild 2018-11-29 21:53:37 +01:00
Michael Pöhn
afdc0be954 yaml build flag prebuild: keep writing string rathern than list of strings when theres just 1 entry 2018-11-29 21:53:37 +01:00
Michael Pöhn
723815a25b fix metadata.Testcase:test_rewrite_yaml_special_build_params 2018-11-29 21:53:37 +01:00
Michael Pöhn
d0a129c216 add test for parsing build field prebuild as string 2018-11-29 21:53:37 +01:00
Michael Pöhn
942de28fa5 yaml metadata: split prebuild build field to list 2018-11-29 21:53:37 +01:00
Marcus
35225a973f Merge branch 'makebuildserver_sdk_improvements' into 'master'
Makebuildserver sdk improvements

See merge request fdroid/fdroidserver!601
2018-11-29 11:00:09 +00:00
Marcus Hoffmann
b9dcfb43cf provision-sdk: don't install obolete stuff
This is probably still lying in the cache bu we explicitly don't want to
install it anymore.
2018-11-28 20:47:09 +01:00
Marcus Hoffmann
19076d1596 provision-ndk: set -x to see what it currently does 2018-11-28 20:46:44 +01:00
Marcus Hoffmann
d94e0c968b makebuildserver: remove platforms/build-tools considered obsolete
They can still be installed pre-build when required via sdkmanager.
Not many apps would need them nowadays.
2018-11-28 19:13:37 +01:00
Marcus Hoffmann
5f904e8774 makebuildserver: use latest platform-28 revision 2018-11-28 18:59:33 +01:00
Marcus Hoffmann
13431fe54e provision-apt: don't run dist-upgrade
It might be a breaking operation with certain package configurations.
Package updates that require this (kernel) should come through the
basebox
2018-11-28 18:58:14 +01:00
Marcus
cf81d198ff Merge branch 'apt_improvements' into 'master'
Apt improvements

Closes #600

See merge request fdroid/fdroidserver!600
2018-11-28 11:28:33 +00:00
Marcus Hoffmann
51accbd1d2 provision-apt: also run dist-upgrade
This ensures the kernel is upgraded as well with security fixes.
2018-11-27 18:14:50 +01:00
Marcus Hoffmann
0dcd034270 buildserver: always set DEBIAN_FRONTEND=noninteractive
closes #600
2018-11-27 18:14:05 +01:00
Marcus Hoffmann
ffb78afd0b provision-apt: add assumeyes config
closes #600
2018-11-27 18:13:33 +01:00
Marcus
c64641a545 Merge branch 'gradle5' into 'master'
Gradle5

Closes #594

See merge request fdroid/fdroidserver!599
2018-11-27 17:05:10 +00:00