Hans-Christoph Steiner
166c28a7e7
Merge branch 'finalize-Vagrantfile.yaml' into 'master'
...
makebuildserver: stop trying to write to Vagrantfile.yaml
See merge request fdroid/fdroidserver!1250
2022-11-04 10:47:30 +00:00
Hans-Christoph Steiner
6ec7e05c76
makebuildserver: stop trying to write to Vagrantfile.yaml
...
If Vagrantfile.yaml exists, makebuildserver should no longer try to write
to it. It is now manully managed now that makebuildserver.config.py no
longer exists. Also, now that the buildserver is smaller, the workflow is
to always destroy and recreate it rather than ever try to reprovision it.
2022-11-04 11:33:55 +01:00
Hans-Christoph Steiner
b709ce8255
Merge branch 'man_db' into 'master'
...
Disable man-db auto-update (as done by sbuild)
See merge request fdroid/fdroidserver!1232
2022-11-03 17:21:35 +00:00
Jochen Sprickerhof
a2050a72fa
Disable man-db auto-update (as done by sbuild)
2022-11-03 17:21:16 +00:00
Hans-Christoph Steiner
422ce78656
Merge branch 'agp' into 'master'
...
* agp:
8.0 Android Gradle Plugin is already listed
update AGP/Gradle map
fdroid/fdroidserver!1236
2022-11-03 17:34:33 +01:00
Hans-Christoph Steiner
9509707df6
8.0 Android Gradle Plugin is already listed
2022-11-03 17:34:07 +01:00
linsui
29079a4423
update AGP/Gradle map
2022-11-03 16:30:30 +00:00
Michael Pöhn
f8395ffe71
Merge branch 'move-makebuildserver.config.py-to-Vagrantfile.yaml' into 'master'
...
buildserver: turn ./makebuildserver into a pure helper script, allow standalone vagrant operation
See merge request fdroid/fdroidserver!1222
2022-11-03 13:01:18 +00:00
Hans-Christoph Steiner
2bf706ebe6
buildserver: clean up dirs from purged packages
2022-11-03 13:27:20 +01:00
Hans-Christoph Steiner
d6008cdb2a
convert examples/makebuildserver.config.py to Vagrantfile.yaml
...
Also, tests/androguard_test.py was removed long ago
2022-11-03 13:27:18 +01:00
Hans-Christoph Steiner
abf535aabe
buildserver: move config to buildserver/Vagrantfile.yaml
2022-11-03 13:27:16 +01:00
Hans-Christoph Steiner
e2fcd633fc
buildserver: hard code basebox name and version
...
This is not user-configurable, so it should not be setup to be. This
process is only tested on the one basebox, and devs can just edit
Vagrantfile directly to test other base boxes.
# Conflicts:
# makebuildserver
2022-11-03 13:27:15 +01:00
Hans-Christoph Steiner
abdd02f33a
makebuildserver: move copy_caches_from_host to command line flag
2022-11-03 13:27:13 +01:00
Hans-Christoph Steiner
21ea1c1c89
makebuildserver: purge apt_package_cache feature
...
This is unmaintained, lightly used, a tangled mess, and can be replaced by
things like the vagrant-cachier plugin or #418
2022-11-03 13:27:11 +01:00
Michael Pöhn
52849deea0
Merge branch 'set_e' into 'master'
...
Run shell scripts with -e (Closes : #1035 )
Closes #1035
See merge request fdroid/fdroidserver!1185
2022-11-03 12:26:06 +00:00
Jochen Sprickerhof
557fe87d44
Run shell scripts with -e ( Closes : #1035 )
...
Make sudo, init prebuild, build and Prepare fields lists and only
concatenate them with '; ' before execution. This allows arbitrary
commands inside the fileds (even && and ';') as we don't need to split
the commands again for rewritemeta.
2022-11-03 12:25:31 +00:00
Michael Pöhn
49d8ba3b9b
Merge branch 'fix-buildserver' into 'master'
...
buildserver: clean up secondary libvirt box image after rebuild
See merge request fdroid/fdroidserver!1247
2022-11-03 12:17:08 +00:00
Hans-Christoph Steiner
6c5ffdc428
buildserver: clean up secondary libvirt box image after rebuild
...
Boxes are stored in two places when using vagrant-libvirt:
1. `vagrant box add` -> ~/.vagrant.d/boxes/buildserver/0/libvirt/
2. `vagrant up` -> /var/lib/libvirt/images/buildserver_vagrant_box_image_0_box.img
If the second box is not cleaned up, then `fdroid build` will continue
to use the one from the second location, thereby ignoring the updated
one at the first location. This keeps the second one around until the
new box is ready in case `fdroid build` is using it while this script
is running.
2022-11-03 12:58:58 +01:00
Jochen Sprickerhof
938b324e4d
Merge branch 'btlog-index-v2' into 'master'
...
binary transparency log improvements
See merge request fdroid/fdroidserver!1245
2022-11-02 19:24:38 +00:00
Hans-Christoph Steiner
890513fcba
index: standardized AntiFeature variable names
...
This is the only occurance of "anti_features".
2022-11-01 09:54:06 +01:00
Hans-Christoph Steiner
886712026d
index: Anti-Features should always be a sorted set
...
There are diffs in the index caused by unstable order:
* 184cdd9c65 (572d84bb16becb794e10614840972554f333c66e_169259_169353)184cdd9c65 (24c372740761176e67461dbc9136a799b15cfdbf_204154_204185)
2022-11-01 09:53:09 +01:00
Hans-Christoph Steiner
cd0c049b03
btlog: include index-v2 files
2022-11-01 08:47:48 +01:00
Jochen Sprickerhof
eb79769b37
Merge branch 'handle-default-txt-in-fdroid-metadata' into 'master'
...
handle default.txt changelog in fdroid metadata/
See merge request fdroid/fdroidserver!1243
2022-10-31 12:13:44 +00:00
Hans-Christoph Steiner
ca13325913
gitlab-ci: simplify ubuntu_jammy_pip job, babel is not needed
...
Babel runs on install now, before it was used to pre-generated the
compiled gettext files.
2022-10-31 12:56:32 +01:00
Hans-Christoph Steiner
ffc3fbe288
handle default.txt changelog in fdroid metadata/
...
fixup !1240
2022-10-31 12:56:30 +01:00
Hans-Christoph Steiner
10c1089eba
Merge branch '1240-fixups' into 'master'
...
!1240 fixups
See merge request fdroid/fdroidserver!1242
2022-10-31 10:06:49 +00:00
Hans-Christoph Steiner
97f3e78fa8
fixup from 8b484b37bd in !1240
2022-10-31 10:56:02 +01:00
Hans-Christoph Steiner
99e0c28d37
run black on tests/updates.TestCase to fix lint failure
2022-10-31 10:19:43 +01:00
Hans-Christoph Steiner
e799f32d71
set black to format to py38 to support Debian/bullseye package
...
Debian/bullseye (stable) includes black v20.8b1, which does not yet know
about the py39 target-version.
2022-10-31 10:19:43 +01:00
Hans-Christoph Steiner
ef292d8d6d
Merge branch 'obfusk-master-patch-68185' into 'master'
...
gradlew-fdroid: use curl --retry 3 --retry-all-errors
Closes #1063
See merge request fdroid/fdroidserver!1241
2022-10-31 08:45:55 +00:00
FC Stegerman
f149b8fbe1
gradlew-fdroid: use curl --retry 3 --retry-all-errors
2022-10-31 08:45:41 +00:00
Hans-Christoph Steiner
027a7fb208
Merge branch 'absurdity' into 'master'
...
* absurdity:
add tests for Fastlane changelogs including default.txt
use default.txt as fallback changelog when inserting fastlane metadata
see fdroid/fdroidserver!1240
2022-10-31 09:42:56 +01:00
Hans-Christoph Steiner
8b484b37bd
add tests for Fastlane changelogs including default.txt
2022-10-31 09:42:19 +01:00
Ashutosh Gangwar
afec880c81
use default.txt as fallback changelog when inserting fastlane metadata
2022-10-30 19:07:52 +05:30
Jochen Sprickerhof
a17627bffa
Merge branch 'volist' into 'master'
...
change VercodeOperation to TYPE_LIST
See merge request fdroid/fdroidserver!1233
2022-10-29 06:41:40 +00:00
linsui
618e2c7d72
change VercodeOperation to TYPE_LIST
2022-10-27 19:11:37 +08:00
Jochen Sprickerhof
747fa13591
Merge branch 'licaon-kter-master-patch-87038' into 'master'
...
buildserver: strip extraneous packages installed by Vagrant base box
See merge request fdroid/fdroidserver!1228
2022-10-25 18:23:06 +00:00
Hans-Christoph Steiner
7976ecc12a
buildserver: mark fdroidserver deps as manual
...
This lets build steps use `apt-get autoremove` and still have a working
fdroidserver.
2022-10-25 19:48:27 +02:00
Hans-Christoph Steiner
817a156ea5
buildserver: strip extraneous packages installed in Vagrant base box
...
The official Debian Vagrant box seems to be a "batteries included" kind of
thing. The buildserver should be as small as possible, so this removes all
the extraneous packages I could find in the Vagrant basebox.
2022-10-25 19:47:31 +02:00
Hans-Christoph Steiner
fdeab70c03
Merge branch 'fix_int_field_0' into 'master'
...
Support 0 as versionCode
See merge request fdroid/fdroidserver!1231
2022-10-25 11:40:15 +00:00
Jochen Sprickerhof
b86d815743
Support 0 as versionCode
...
See: !1230
2022-10-25 12:55:44 +02:00
Jochen Sprickerhof
8533c9cb4b
Merge branch 'fix_ipfs_test' into 'master'
...
Fix ipfs test config
See merge request fdroid/fdroidserver!1226
2022-10-24 09:58:05 +00:00
Jochen Sprickerhof
5e1bdfc278
Fix ipfs test config
2022-10-24 11:43:47 +02:00
Jochen Sprickerhof
7bd7e5c0db
Merge branch 'python_3.9' into 'master'
...
Require Python 3.9
Closes #1038
See merge request fdroid/fdroidserver!1224
2022-10-24 09:18:04 +00:00
FestplattenSchnitzel
625dc11930
Require Python 3.9
2022-10-24 09:17:27 +00:00
Jochen Sprickerhof
ecaf1fc770
Merge branch 'download-retries' into 'master'
...
net.download_file(): retry on errors
Closes #1058
See merge request fdroid/fdroidserver!1225
2022-10-24 09:11:49 +00:00
FC Stegerman
d1ddd525c1
net.download_file(): retry on errors
2022-10-22 23:15:13 +02:00
Hans-Christoph Steiner
c61c9f3895
Merge branch 'gradle-release-checksums.py' into 'master'
...
update to gradle v7.5.1
See merge request fdroid/fdroidserver!1223
2022-10-20 16:16:04 +00:00
fdroid-bot
d19d34d944
gradle v7.5.1
2022-10-20 16:03:14 +00:00
Hans-Christoph Steiner
b2a96662b6
Merge branch 'fix-vagrant-package' into 'master'
...
buildserver: fix `vagrant package` step
Closes #990
See merge request fdroid/fdroidserver!1220
2022-10-20 16:02:31 +00:00
