8428 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Jochen Sprickerhof	300278e7c2	remove transitional apt-transport-https package	2022-10-12 18:57:23 +00:00
Hans-Christoph Steiner	fd9b911a42	Dockerfile: apt-mark manual fdroidserver dependencies ... Then apt-get does not warn about unneeded deps that could be autoremoved.	2022-10-12 18:57:23 +00:00
Hans-Christoph Steiner	7a40e5f6d5	Merge branch 'status_only_on_build' into 'master' ... Write build/status.json only on build See merge request fdroid/fdroidserver!1210	2022-10-12 16:17:38 +00:00
Jochen Sprickerhof	dfdd29131f	Write build/running.json only on build ... This should reduce the runtime. Also test if it was written.	2022-10-12 15:25:17 +02:00
Jochen Sprickerhof	b3f0f6f77e	Merge branch 'pow' into 'master' ... Allow pow in VercodeOperation (Closes: #1021) Closes #1021 See merge request fdroid/fdroidserver!1158	2022-10-12 09:04:59 +00:00
Jochen Sprickerhof	8244ffa0ff	Allow pow in VercodeOperation (Closes: #1021)	2022-10-12 08:51:17 +00:00
Jochen Sprickerhof	79be3c1e5d	Merge branch 'fix-ipfs_cid-detection' into 'master' ... fix ipfs_cid detection logic See merge request fdroid/fdroidserver!1209	2022-10-12 06:54:02 +00:00
Hans-Christoph Steiner	ade0122d47	fix ipfs_cid detection logic ... @obfusk caught this. I messed up in 02a91cba66 from !1202	2022-10-11 23:31:08 +02:00
Hans-Christoph Steiner	0c8e0abf28	Merge branch 'grab-bag-o-six' into 'master' ... Grab bag o' six See merge request fdroid/fdroidserver!1202	2022-10-11 14:51:55 +00:00
Hans-Christoph Steiner	f97dc0d010	version 2.2 alpha 0	2022-10-11 16:36:13 +02:00
Hans-Christoph Steiner	353ee84a6f	test that get_apk_id throws exceptions (issuebot#60)	2022-10-11 16:36:11 +02:00
Hans-Christoph Steiner	828eb938c3	gradlew-fdroid: Gradle Android Plugin 7.3 needs Gradle 7.4	2022-10-11 16:36:09 +02:00
Hans-Christoph Steiner	02a91cba66	update: only show missing ipfs_cid warning once.	2022-10-11 16:36:08 +02:00
Hans-Christoph Steiner	29838a8bae	gitlab-ci: update alpine to supported version	2022-10-11 16:27:05 +02:00
Hans-Christoph Steiner	766ce52ebe	Merge branch 'hgsvn' into 'master ... * mergeme: buildserver: fix apksigner install Pre-install git-svn and mercurial fdroid/fdroidserver!1206	2022-10-11 16:24:10 +02:00
Hans-Christoph Steiner	759fa3b40a	buildserver: fix apksigner install ... Adding /bullseye-backports confuses things apparently. Without it, apt will look in bullseye-backports automatically, including for deps. But it will not look for deps in bullseye-backports if /bullseye-backports is used. !1205	2022-10-11 16:23:45 +02:00
linsui	47cbc47346	Pre-install git-svn and mercurial	2022-10-11 13:31:51 +00:00
Jochen Sprickerhof	60be04336f	Merge branch 'buildserver-needs-apksigner' into 'master' ... buildserver: include apksigner for Binaries: verification See merge request fdroid/fdroidserver!1205	2022-10-11 12:04:20 +00:00
Hans-Christoph Steiner	b58eaa224b	buildserver: include apksigner for Binaries: verification ... Verification of Binaries: happens in the buildserver VM first, so it needs a matching version of apksigner as the rest of the process. This fixes: https://gitlab.com/fdroid/fdroidserver/-/jobs/3154772374	2022-10-11 12:03:55 +00:00
Hans-Christoph Steiner	d33907606e	gitlab-ci: install sdkmanager from bullseye-backports	2022-10-11 13:57:38 +02:00
Jochen Sprickerhof	c6f83a58f2	Merge branch 'mvn' into 'master' ... remove MVN3 See merge request fdroid/fdroidserver!1203	2022-10-11 11:26:09 +00:00
linsui	e90f03a494	remove MVN3	2022-10-11 09:58:35 +00:00
Hans-Christoph Steiner	98437d88d0	Merge branch 'keep-fdroidserver-dependencies' into 'master' ... buildserver: prevent fdroidserver deps from being purged in Docker See merge request fdroid/fdroidserver!1204	2022-10-11 08:57:08 +00:00
Hans-Christoph Steiner	e192eb4a32	buildserver: prevent fdroidserver deps from being purged in Docker	2022-10-11 10:52:54 +02:00
Hans-Christoph Steiner	b4720d9201	gitlab-ci: fix reversed logic in docker push ... I got it backwards in 66d8b783f0 from !1183	2022-10-11 09:53:42 +02:00
Hans-Christoph Steiner	b0124aca1a	Merge branch 'upgrade_buildserver_vm' into 'master' ... Upgrade Buildserver VM to latest Debian (Bullseye) See merge request fdroid/fdroidserver!1012	2022-10-11 07:38:44 +00:00
Hans-Christoph Steiner	4e839ac63b	switch to latest vagrant boxes	2022-10-10 21:22:59 +02:00
Hans-Christoph Steiner	a0ea27632e	buildserver: use HTTPS for security.debian.org ... It is now officially supported: https://guardianproject.info/2021/12/08/debian-over-https/	2022-10-10 21:22:59 +02:00
Hans-Christoph Steiner	4eb189ad2e	gitlab-ci: plugin_fetchsrclibs runs in same base OS as fdroiddata	2022-10-10 21:22:59 +02:00
Hans-Christoph Steiner	c6f5956537	install Vagrant insecure_private_key into buildserver box ... Vagrant uses the "insecure private key" to establish the first SSH connection to a new VM based on a clean public box. In theory, the `vagrant package` command should do that automatically. This process is still using custom code instead of `vagrant package`, hence this script. This public key can be generated on any Vagrant install using: ssh-keygen -y -f ~/.vagrant.d/insecure_private_key https://www.vagrantup.com/docs/vagrantfile/ssh_settings#config-ssh-private_key_path fdroid-bootstrap-buildserver#12 !1012 !1099	2022-10-10 21:22:59 +02:00
Jochen Sprickerhof	046d3c8dcf	Use ssh_config.d	2022-10-10 21:22:59 +02:00
Jochen Sprickerhof	c208582e75	Drop old java_paths	2022-10-10 21:22:59 +02:00