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
Marcus Hoffmann
8ac171ba1a
add gradle 5.0
...
closes #594
2018-11-27 17:34:53 +01:00
Marcus Hoffmann
2a2613520a
provision-gradle: skip versions older than 2.2.1
...
These are almost never used now and still can be downloaded on-demand.
2018-11-27 17:34:53 +01:00
Hans-Christoph Steiner
dcc9ada1d1
Merge branch 'makebuildserver_improvements' into 'master'
...
Makebuildserver improvements
Closes #591
See merge request fdroid/fdroidserver!598
2018-11-27 16:02:38 +00:00
Marcus Hoffmann
e3a25ad3f2
buildserver: remove provision-pip
...
This was installing one python(2!) module. pip is installed in
provision-apt-get-install now.
2018-11-27 14:48:20 +01:00
Marcus Hoffmann
90a1703ccc
makebuildserver: remove packages that should be installed per app
...
Or these are otherwise old cruft
2018-11-27 14:47:36 +01:00
Marcus Hoffmann
3c1a5873ab
provision-apt: don't use automake/libtool from testing
...
This was set up when running jessie and shouldn;t be requried for now.
2018-11-27 14:47:17 +01:00
Marcus Hoffmann
85b90ee266
provision-apt: add DEBIAN_FRONTEND=noninteractive
...
This should fix #591 and related issues.
2018-11-27 14:47:08 +01:00
Marcus
4144153d25
Merge branch 'revert-buildserver-deb-mirror-provision' into 'master'
...
simplify debian mirror setup
Closes #599
See merge request fdroid/fdroidserver!597
2018-11-27 13:26:27 +00:00
Michael Pöhn
201240e603
simplify debian mirror setup
2018-11-27 14:07:19 +01:00
Marcus
3a75f81709
Merge branch 'include-pip-in-buildserver' into 'master'
...
buildserver: include pip for both Python 2.x and 3.x
See merge request fdroid/fdroidserver!594
2018-11-20 11:25:31 +00:00
Hans-Christoph Steiner
e2e63c9ac3
buildserver: include pip for both Python 2.x and 3.x
...
`pip install` is a relatively common thing for app builds to use in sudo=,
so it should be built into the buildserver. This then builds in the trust
relationship to pypi, since it comes from Debian rather than some random
pip download/install process.
2018-11-20 12:10:40 +01:00
Hans-Christoph Steiner
0688090440
Merge branch 'fix-vm-uuid-lookup' into 'master'
...
fix .vagrant directory based vm provider lookup
See merge request fdroid/fdroidserver!593
2018-11-20 09:18:26 +00:00
Michael Pöhn
ddcab79817
fix .vagrant directory based vm provider lookup
2018-11-16 16:53:01 +01:00
Michael Pöhn
f96db03121
Merge branch 'force_exit' into 'master'
...
force_exit() to make exit work with all `fdroid build` conditions
See merge request fdroid/fdroidserver!592
2018-11-14 14:58:30 +00:00
Hans-Christoph Steiner
1f346b3149
force_exit() to make exit work with all fdroid build
conditions
...
The build command has to use some threading stuff to handle the timeout and
locks. This seems to prevent the command from exiting, unless this hack is
used.
2018-11-14 14:27:32 +01:00
Hans-Christoph Steiner
568256f75c
Merge branch 'apt_get_update' into 'master'
...
provisioners: work around apt-get update problem
See merge request fdroid/fdroidserver!590
2018-10-24 11:53:24 +00:00
Marcus Hoffmann
10e3165e41
provisioners: work around apt-get update problem
2018-10-24 13:06:27 +02:00
Marcus
15d422b01b
Merge branch 'ndk18' into 'master'
...
Add NDK r18b
See merge request fdroid/fdroidserver!588
2018-10-22 16:31:57 +00:00
Licaon_Kter
210c62f136
Add NDK r18b
2018-10-22 16:31:57 +00:00
Hans-Christoph Steiner
ff578dae30
Merge branch 'utf8-fixes' into 'master'
...
UTF-8 fixes
See merge request fdroid/fdroidserver!587
2018-10-19 14:00:00 +00:00
Hans-Christoph Steiner
117d63cca5
update: use 'replace' mode to handle non-UTF8 description files
...
Fastlane/Triple-T app store metadata files must be in UTF-8. Before this
would crash if they were not. This changes the handling to just replace
the non-UTF8 chars with a �. Here's the stacktrace:
CRITICAL: Unknown exception found!
Traceback (most recent call last):
File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroid", line 164, in <module>
main()
File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroid", line 159, in main
raise e
File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroid", line 138, in main
mod.main()
File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 2010, in main
insert_localized_app_metadata(apps)
File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 885, in insert_localized_app_metadata
os.path.join(root, f))
File "/var/lib/jenkins/userContent/reproducible/reproducible_fdroid_build_apps/fdroidserver/update.py", line 700, in _set_localized_text_entry
text = fp.read()[:limit]
File "/usr/lib/python3.5/codecs.py", line 321, in decode
(result, consumed) = self._buffer_decode(data, self.errors, final)
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xfc in position 94: invalid start byte
2018-10-19 15:06:16 +02:00
Hans-Christoph Steiner
57556aceee
remove redundant open() arg: encoding='utf8'
...
By default, open() returns a str:
https://docs.python.org/3/library/functions.html#open
By default, str is UTF-8:
https://docs.python.org/3/library/stdtypes.html#str
This used to matter on Python 2.x, but this code is 3.x only now.
2018-10-19 15:01:34 +02:00
Hans-Christoph Steiner
6e5d1a6cc3
jenkins: another attempt to force the locale to a more standard one
2018-10-17 17:17:16 +02:00
Hans-Christoph Steiner
92bf9315e6
Merge branch 'verifiy-basebox' into 'master'
...
* verifiy-basebox:
jenkins: switch to using auto-downloaded and verified basebox
makebuildserver: verify stretch basebox
fdroid/fdroidserver!581
2018-10-17 17:04:16 +02:00
Hans-Christoph Steiner
9dff760d07
jenkins: switch to using auto-downloaded and verified basebox
2018-10-17 17:02:21 +02:00
Hans-Christoph Steiner
ceb3f6631b
Merge branch 'update-import-fixups' into 'master'
...
update/import fixups
Closes #548 and #472
See merge request fdroid/fdroidserver!584
2018-10-12 12:59:43 +00:00
Michael Pöhn
9a85f0007c
Merge branch 'use-libvirt-defaults' into 'master'
...
buildserver: only set disk_bus/nic_model_type if set in config file
See merge request fdroid/fdroidserver!586
2018-10-11 10:32:19 +00:00
Hans-Christoph Steiner
3b0c8fe669
buildserver: only set disk_bus/nic_model_type if set in config file
...
This makes vagrant/KVM just use the default if these are not set in the
makebuildserver.config.py.
fdroid/fdroidserver!585
2018-10-11 12:11:15 +02:00
Hans-Christoph Steiner
9458a69c54
Merge branch 'libvirt-virtio-config' into 'master'
...
makebuildserver: options for disk and network hardware emulation
See merge request fdroid/fdroidserver!585
2018-10-11 10:07:29 +00:00
Hans-Christoph Steiner
e591a73b82
update bash completion for fdroid import
2018-10-11 12:02:22 +02:00