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
Hans-Christoph Steiner
1dd480405e
buildserver: let vagrant package
handle insecure private key
...
This script was overwriting the provisioning that `vagrant package` does
already, and breaking `vagrant ssh`. It should have been removed in !1099
closes #990
fdroid-bootstrap-buildserver#12
!1012
!1099
c6f5956537
2022-10-20 17:42:53 +02:00
Hans-Christoph Steiner
1e2e82fbde
makebuildserver: use HTTPS in default debian apt source
2022-10-20 17:42:50 +02:00
Hans-Christoph Steiner
cdee2caa03
Merge branch 'post-bullseye-ci-updates' into 'master'
...
gitlab-ci: port ubuntu_bionic_pip to Ubuntu/jammy
See merge request fdroid/fdroidserver!1221
2022-10-20 15:36:18 +00:00
Hans-Christoph Steiner
2b5c35829f
tests/run-tests: fix "fatal: transport 'file' not allowed"
...
https://gitlab.com/eighthave/fdroidserver/-/jobs/3202418899
2022-10-20 17:21:43 +02:00
Hans-Christoph Steiner
2bde06a60f
gitlab-ci: port ubuntu_bionic_pip to Ubuntu/jammy
...
This job is here to test using fdroidserver with only depends from pip
and sdkmanager (e.g. not apt-get). Production is now on bullseye #1038
2022-10-19 14:10:46 +02:00
Hans-Christoph Steiner
eafa7f5e70
gitlab-ci: delete buster_backports job, prod signing is on bullseye
...
Via private email with @CiaranG
2022-10-19 14:06:59 +02:00
Hans-Christoph Steiner
81f02b8279
gitlab-ci: fix apt.conf syntax for Acquire::Retries
2022-10-19 13:56:28 +02:00
Jochen Sprickerhof
6071ae8f38
Merge branch 'multi' into 'master'
...
Support autoupdate multi build blocks
See merge request fdroid/fdroidserver!1169
2022-10-16 08:13:02 +00:00
linsui
68b58c043f
Change VercodeOperation to list
...
... so that we can calculate multiple version codes to support multi-arch autoupdate
2022-10-15 17:19:49 +08:00
linsui
0d39169840
checkupdates.TestCase: remove indentation
...
These assert functions doesn't need to be in the mock context.
2022-10-15 16:09:19 +08:00
Jochen Sprickerhof
e62a2a86fc
Merge branch 'vercode' into 'master'
...
make versionCode an integer
Closes #332
See merge request fdroid/fdroidserver!1176
2022-10-14 09:02:12 +00:00
linsui
5a28f20301
make versionCode/build.timeout an integer
...
Co-authored-by: Jochen Sprickerhof <git@jochen.sprickerhof.de>
2022-10-14 08:42:26 +00:00
linsui
6f73a87eb1
fix typo: Build -> Builds
2022-10-14 08:42:26 +00:00
Michael Pöhn
44eab1d5d2
Merge branch 'use-vagrant-package' into 'master'
...
makebuildserver: use `vagrant package` and purge custom code
Closes #990
See merge request fdroid/fdroidserver!1099
2022-10-13 14:10:55 +00:00