kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 22:40:12 +01:00
Code Activity
8,157 Commits 1 Branch 59 Tags 40 MiB
3ee91d1777
Commit Graph

8157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans-Christoph Steiner
ad960c6ecd
remove last maven: quirks and make it always a string 
It turns out that the maven: field was originally declared as a TYPE_STRING,
given that it was not given a different type in metadata.py's 	flagtypes.
The code was confused because it was given a default value of `False` rather
than `None` as the rest of the TYPE_STRING fields have.

This construct in build.py means maven: should always be a string:

        if '@' in build.maven:
            maven_dir = os.path.join(root_dir, build.maven.split('@', 1)[1])
        else:
            maven_dir = root_dir
 2023-04-24 11:08:48 +02:00
Hans-Christoph Steiner
a107e810d4
build: add test case for maven: builds 2023-04-24 11:08:46 +02:00
Hans-Christoph Steiner
7641c30389
add real test of moving files with deploy.update_serverwebroot() 2023-04-24 11:08:42 +02:00
Hans-Christoph Steiner
fa95302580
add myself to .mailmap !1347 2023-04-21 08:01:44 +02:00
Hans-Christoph Steiner
f09c806c96 Merge branch 'mailmap' into 'master' 
Add .mailmap

See merge request fdroid/fdroidserver!1347
 2023-04-21 05:56:28 +00:00
Gregor Düster
a2868766db
Add .mailmap 
See https://git-scm.com/docs/gitmailmap .
 2023-04-21 07:21:45 +02:00
Hans-Christoph Steiner
331d3663db Merge branch 'metadata_purge_legacy' into 'master' 
metadata: Remove code ensuring YAML 1.2 compatibility

See merge request fdroid/fdroidserver!1328
 2023-04-20 07:59:20 +00:00
Gregor Düster
d971f19e92
metadata: Remove code ensuring YAML 1.2 compatibility 
This is no longer necessary b/c the current YAML parser, ruamel.yaml,
implements YAML 1.2 in contrast to the previous parser PyYAML.
 2023-04-18 17:08:44 +02:00
Gregor Düster
cff57e1a53
metadata: Remove ununsed code 2023-04-18 17:08:43 +02:00
Michael Pöhn
82c3e364a5 Merge branch 'fix-ci-for-sdkmanager' into 'master' 
gitlab-ci: ubuntu_lts_ppa & debian_testing jobs need sdkmanager

See merge request fdroid/fdroidserver!1339
 2023-04-13 13:32:15 +00:00
Hans-Christoph Steiner
3b0a6575de gitlab-ci: ubuntu_lts_ppa & debian_testing jobs need sdkmanager 2023-04-13 12:32:47 +00:00
Hans-Christoph Steiner
894a421d43 Merge branch 'gradle-release-checksums.py' into 'master' 
update to gradle v8.1

See merge request fdroid/fdroidserver!1341
 2023-04-12 14:06:19 +00:00
fdroid-bot
c107d93568 gradle v8.1 2023-04-12 12:45:24 +00:00
Hans-Christoph Steiner
5e3624157c Merge branch 'sonatype' into 'master' 
Add maven central staging repo to allowed list

See merge request fdroid/fdroidserver!1340
 2023-04-12 12:44:43 +00:00
Jason Donenfeld
6a239cbde4 Add maven central staging repo to allowed list 2023-04-12 12:44:42 +00:00
Hans-Christoph Steiner
135fb76b6d Merge branch 'update_status' into 'master' 
Write status json upon fdroid update start (Closes: #1114)

Closes #1114

See merge request fdroid/fdroidserver!1338
 2023-04-11 16:45:45 +00:00
Jochen Sprickerhof
f5cdeff507
Write status json upon fdroid update start (Closes: #1114) 2023-04-11 17:14:58 +02:00
Hans-Christoph Steiner
ab3f64c22f Merge branch 'fix-apt-syntax' into 'master' 
buildserver: fix apt Acquire::Retries syntax

See merge request fdroid/fdroidserver!1337
 2023-04-11 14:45:45 +00:00
Hans-Christoph Steiner
48be7c3b25
buildserver: fix apt Acquire::Retries syntax 
Acquire is its own group, not a subgroup of APT:
https://manpages.debian.org/buster/apt/apt.conf.5.en.html#THE_ACQUIRE_GROUP
 2023-04-11 16:33:14 +02:00
Hans-Christoph Steiner
f5d5d9e9b8 Merge branch 'remove-download-handling' into 'master' 
remove NDK download handling in favor of fdroid/sdkmanager

See merge request fdroid/fdroidserver!1070
 2023-04-11 11:55:18 +00:00
Hans-Christoph Steiner
36d2a8f899
all ndk paths in config must be strings 
The paths in the config must be strings because they are used in things
like env vars where they must be strings.  Plus lots of other places in the
code assumes they are strings.  This is the first step to defining the
border of where paths can be pathlib.Path() and where they must be strings.
 2023-04-11 13:54:19 +02:00
Hans-Christoph Steiner
898624dcac
common.get_android_tools_versions() for modern NDK dir layout 
NDK r10e is still in use, but is so old, it does not have the modern
sdkmanager package metadata.
 2023-04-11 13:54:17 +02:00
Hans-Christoph Steiner
0dd5a7db64
remove NDK download handling in favor of fdroid/sdkmanager 2023-04-11 13:54:05 +02:00
Hans-Christoph Steiner
66d750e5fa Merge branch 'fix_ipfs_test' into 'master' 
Strip ipfsCIDv1 before testing index-v2

See merge request fdroid/fdroidserver!1335
 2023-04-11 10:29:57 +00:00
Jochen Sprickerhof
d59a88f844 Strip ipfsCIDv1 before testing index-v2 2023-04-11 10:29:27 +00:00
Hans-Christoph Steiner
239ab5bd21 Merge branch 'test_find_sdk_tools_cmd-intermittent' into 'master' 
set skipUnless for test that relies on ANDROID_HOME

See merge request fdroid/fdroidserver!1334
 2023-04-11 09:05:18 +00:00
Hans-Christoph Steiner
94badac317 set skipUnless for test that relies on ANDROID_HOME 
This job just started failing, but wasn't before:
https://gitlab.com/eighthave/fdroidserver/-/jobs/4060582594

But I look at it, and it looks right that it fails.  So how on earth
was it succeeding before?  Basically the `os.getenv('ANDROID_HOME')`
returns `None` when `ANDROID_HOME` is not set. It is not set in both the
jobs, so how did it not stacktrace before?
 2023-04-04 22:41:46 +02:00
Hans-Christoph Steiner
7c85afc988 Merge branch 'fix_antifeatures' into 'master' 
Fix antifeatures

See merge request fdroid/fdroidserver!1331
 2023-04-04 14:21:10 +00:00
Jochen Sprickerhof
889b8cb372 Don't copy per version anti features to all versions 
make_v0() modified the apps data structure to copy an anti feature for a
specific version to all versions resulting in index-v1 and -v2 to
contain wrong anti feature annotations. This patch fixes this and adds a
test that the data structure is no longer modified.

The bug shadowed bugs in the AF implementation of -v1 and -v2 resulting
in not coping the version specific data. This is corrected as well.
This is also tested now.

For -v2 the AF dict is now sorted to make the result reproducible.

Finally The NoSourceSince AF was added as a per version and overall AF
in -v1 and is now only applied as an overall AF and the test is updated
accordingly.
 2023-04-04 14:20:41 +00:00
Jochen Sprickerhof
484f289919 index.TestCase: support more arguments (like -k) 2023-04-04 14:20:41 +00:00
Hans-Christoph Steiner
4a386aa2eb Merge branch 'licaon-kter-master-patch-59706' into 'master' 
Scanner - add newer sonatype maven repos

Closes #1113

See merge request fdroid/fdroidserver!1333
 2023-04-04 11:30:55 +00:00
Licaon_Kter
35133a9a8f Scanner - add newer sonatype maven repos 2023-04-04 11:00:13 +00:00
Hans-Christoph Steiner
4165c32e2f Merge branch 'fix_class' into 'master' 
vmtools: Properly initialize provider member

See merge request fdroid/fdroidserver!1329
 2023-03-21 14:02:21 +00:00
Jochen Sprickerhof
2a5b127773
vmtools: Properly initialize provider member 2023-03-21 14:00:58 +01:00
Hans-Christoph Steiner
0136872154 Merge branch 'pylint' into 'master' 
pylint: Reenable 10 checks

See merge request fdroid/fdroidserver!1319
 2023-03-20 16:51:40 +00:00
Hans-Christoph Steiner
8f4167660e disable pylint no-member on tests/extra/manual-vmtools-test.py 
This script is some of the only documentation of certain processes that
run in the buildserver setup.  It is not really maintained, but is still
here as a kind of reference.
 2023-03-20 17:38:10 +01:00
Hans-Christoph Steiner
9749b26baa pylint: Reenable C0201 consider-iterating-dictionary 
* C0201: Consider iterating the dictionary directly instead of calling .keys() (consider-iterating-dictionary)
 2023-03-20 16:33:16 +01:00
FestplattenSchnitzel
a4c1ca48ad pylint: Reenable R1722 consider-using-sys-exit 
* R1722: Consider using 'sys.exit' instead (consider-using-sys-exit)
 2023-03-20 16:33:16 +01:00
Hans-Christoph Steiner
1fbfae355a pylint: Reenable R1723 no-else-break 
* R1723: Unnecessary "elif" after "break", remove the leading "el" from "elif" (no-else-break)
 2023-03-20 16:33:16 +01:00
FestplattenSchnitzel
abc752314b pylint: Reenable E1101 no-member 2023-03-20 16:33:16 +01:00
FestplattenSchnitzel
1dcb863f55 pylint: Set Python version, exclude vendored file 2023-03-20 16:33:16 +01:00
Jochen Sprickerhof
b5ec531e72 Merge branch 'checkupdates' into 'master' 
checkupdates: skip when there is no match for version

See merge request fdroid/fdroidserver!1321
 2023-03-20 14:43:41 +00:00
linsui
88eac942ec checkupdates: skip when there is no match for version 
... name regex in CheckUpdateData
 2023-03-20 14:31:08 +00:00
Jochen Sprickerhof
99be8d679d Merge branch 'fix-ci' into 'master' 
fix the current crop of new CI failures

See merge request fdroid/fdroidserver!1327
 2023-03-20 14:28:21 +00:00
Hans-Christoph Steiner
b92e280eab fix code format for new black rule 2023-03-20 14:47:48 +01:00
Hans-Christoph Steiner
e903952029 always use defusedxml.ElementTree, never xml.etree.ElementTree 
defusedxml is now available and installed everywhere, including the
buildserver VM and the buildserver host.

This fixes bandit's error because it didn't understand the try: block
* https://gitlab.com/eighthave/fdroidserver/-/jobs/3965835264
* https://bandit.readthedocs.io/en/1.7.5/blacklists/blacklist_calls.html#b313-b320-xml
 2023-03-20 14:44:13 +01:00
Hans-Christoph Steiner
4295d254f9 build: actually raise exception when ndk: entry is invalid 
pylint said:
fdroidserver/common.py:4238:8: W0133: Exception statement has no effect (pointless-exception-statement)
 2023-03-20 14:43:44 +01:00
Hans-Christoph Steiner
bf5e65dd24 pylint: hide broad-exception-caught and broad-exception-raised 
I suppose it would be nice to have these enabled, but yeah...
 2023-03-20 14:43:44 +01:00
Hans-Christoph Steiner
08d4b4671c Merge branch 'ndk-path-long' into 'master' 
metadata.Build.ndk_path(): find long form ndk too

Closes #1099

See merge request fdroid/fdroidserver!1313
 2023-03-20 13:40:10 +00:00
FC Stegerman
a5978ad8b2 metadata.Build.ndk_path(): find long form ndk too 2023-03-20 13:39:47 +00:00