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
Hans-Christoph Steiner
9089750277
buildserver: show informative message if Vagrant is not configed
2022-10-13 13:56:56 +00:00
Hans-Christoph Steiner
b4d25d2834
makebuildserver: use vagrant package
; purge custom code
...
Years ago, vagrant-libvirt did not implement the `vagrant package` command
that we needed, and there were no Ruby people around to implement it for us.
So we hacked a custom version in our Python wrapper. Now, vagrant-libvirt
v0.7.0 does implement it, so this switches things to just using
`vagrant package`
2022-10-13 13:56:56 +00:00
Hans-Christoph Steiner
380403cb54
Merge branch 'status_json_earlier' into 'master'
...
Sync status json after every build
See merge request fdroid/fdroidserver!1215
2022-10-13 11:20:25 +00:00
Jochen Sprickerhof
9c0d50a9b2
Sync status json after every build
...
dfdd2913
the logic to only write the status json upon build but before
the build happens. This makes sure that it is written after a
successful build or exception.
2022-10-13 11:20:15 +00:00
Hans-Christoph Steiner
cd8ded730a
Merge branch 'fix-scanner-config-loading' into 'master'
...
scanner: fix loading config.yml
See merge request fdroid/fdroidserver!1216
2022-10-13 11:12:05 +00:00
Michael Pöhn
06b8150922
scanner: fix loading config.yml
...
With my last merge request I accidentally intoduced a bug where
scanner.py stopped loading 'config.yml' because the helper functions
from common.py get called in the wrong places. This change fixes this
issue.
2022-10-13 10:53:25 +02:00
Jochen Sprickerhof
c1b665e3f9
Merge branch 'install-buildserver-with-fdroid-sdkmanager' into 'master'
...
buildserver: install default SDK packages using fdroid/sdkmanager
Closes #927
See merge request fdroid/fdroidserver!1212
2022-10-12 19:13:07 +00:00
Hans-Christoph Steiner
bdc10caa57
add missing build-tools and platforms
2022-10-12 20:57:55 +02:00
Hans-Christoph Steiner
daa5ad152e
buildserver: install default SDK packages using fdroid/sdkmanager
...
fdroid/sdkmanager provides a root of trust to verify all the packages it
downloads, so it fully replaces what makebuildserver was doing.
closes #927
2022-10-12 20:57:55 +02:00
Hans-Christoph Steiner
e4f1066bb1
stop installing ancient plaforms: 2.1 (7), 2.2 (8), 2.3 (9)
...
fdroid/sdkmanager has bugs with some of these, and some of these have been
taken down. https://dl.google.com/android/repository/android-2.3_r01-linux.zip
gives a 404.
2022-10-12 20:57:55 +02:00
Hans-Christoph Steiner
1d710947b9
buildserver: stop installing 'android;m2repository' by default
...
It is a huge package, it is rarely used, its not supported by
fdroid/sdkmanager yet, and it is a pain to manage the install. If this
breaks any app builds, the package can be installed as part of the build
metadata.
2022-10-12 20:57:55 +02:00
Hans-Christoph Steiner
41266f2ac3
Merge branch 'buildserver-docker-apt-mark-manual' into 'master'
...
Dockerfile: apt-mark manual fdroidserver dependencies
See merge request fdroid/fdroidserver!1213
2022-10-12 18:57:38 +00:00