Hans-Christoph Steiner
79bb763986
Merge branch 'fix_git_describe' into 'master'
...
Use git rev-parse instead of describe
See merge request fdroid/fdroidserver!1427
2024-01-09 14:04:26 +00:00
Hans-Christoph Steiner
0849e664e7
metadata_v0: use git rev-parse
instead of git describe
2024-01-09 14:54:38 +01:00
Jochen Sprickerhof
d3abb74c88
Use git rev-parse instead of describe
...
We only want the hash.
2024-01-09 13:15:23 +01:00
Hans-Christoph Steiner
252af24cc3
Merge branch 'lint-config-files' into 'master'
...
lint config files
See merge request fdroid/fdroidserver!1418
2024-01-09 09:41:35 +00:00
Hans-Christoph Steiner
d7a673523d
"field will be in random order" only applies to config.py
...
YAML only has lists, no sets or tuples, so this warning can only ever make
any sense when config.py is the active config file.
2024-01-09 09:32:37 +00:00
Hans-Christoph Steiner
a1d9d9d885
switch to loading mirrors.yml with ruamel to get YAML 1.2 support
2024-01-09 09:32:37 +00:00
Hans-Christoph Steiner
96fc49d7fc
lint: check syntax of countryCode: fields for mirrors
2024-01-09 09:32:37 +00:00
Hans-Christoph Steiner
4511da68b9
lint: support linting config files
2024-01-09 09:32:37 +00:00
Hans-Christoph Steiner
3f35b0b361
lint: do yamllint install check once globally
2024-01-09 09:32:37 +00:00
Hans-Christoph Steiner
a3b7c5ad12
Merge branch 'parse-srclibs' into 'master'
...
handle all cases of @ in srclibs, and remove duplicate code
See merge request fdroid/fdroidserver!1424
2024-01-08 15:02:34 +00:00
Hans-Christoph Steiner
6faaae9431
always parse srclib entries with parse_srclib_spec()
...
Remove duplicated code.
2024-01-07 10:50:29 +01:00
Hans-Christoph Steiner
15b983f48d
handle all cases of @ in srclibs
...
expands on fdroidserver!1422
2024-01-07 10:50:29 +01:00
Hans-Christoph Steiner
599bd5a3a1
Merge branch 'srclib' into 'master'
...
allow @ in srclib tag
See merge request fdroid/fdroidserver!1422
2024-01-06 21:46:33 +00:00
linsui
2331bcfe15
all @ in srclib tag
2023-12-19 15:49:17 +08:00
Hans-Christoph Steiner
83cd04f3b6
Merge branch 'macOS' into 'master'
...
GitLab CI: add shellcheck, androguard <4, silence irrelevant bandit error, enable macOS job
See merge request fdroid/fdroidserver!1421
2023-12-15 08:47:42 +00:00
Hans-Christoph Steiner
8c8b9021f5
tests/run-tests: disable nightly.TestCase on non-Linux until its ported
2023-12-15 09:15:19 +01:00
Hans-Christoph Steiner
52f27aea75
tests/run-tests: temp disable git mirror test on non-Linux
...
I looked into this but couldn't figure it out. It is the only failing
test on macOS, so it seemed worth just adding this single quirk for now.
2023-12-15 09:15:19 +01:00
Hans-Christoph Steiner
d9288c8613
gitlab-ci: add macOS job based on only Travis job
2023-12-15 09:14:50 +01:00
Hans-Christoph Steiner
2f84ce36da
androguard 4 came out, and has breaking changes
2023-12-15 08:40:27 +01:00
Hans-Christoph Steiner
2d5770985f
gitlab-ci: silence irrelevant bandit error
...
This SSH connection is only ever to the Vagrant VM on the same machine.
>> Issue: [B507:ssh_no_host_key_verification] Paramiko call with policy set to automatically trust the unknown host key.
Severity: High Confidence: Medium
CWE: CWE-295 (https://cwe.mitre.org/data/definitions/295.html )
More Info: https://bandit.readthedocs.io/en/1.7.6/plugins/b507_ssh_no_host_key_verification.html
Location: ./fdroidserver/build.py:104:8
103 sshs = paramiko.SSHClient()
104 sshs.set_missing_host_key_policy(paramiko.AutoAddPolicy())
105 sshs.connect(sshinfo['hostname'], username=sshinfo['user'],
2023-12-15 08:40:27 +01:00
Hans-Christoph Steiner
865673964e
gitlab-ci: enable shellcheck on tests/run-tests
2023-12-15 08:40:01 +01:00
Hans-Christoph Steiner
9d8c098f74
gitlab-ci: add shellcheck to gradlew-fdroid checks
2023-12-15 08:39:13 +01:00
Hans-Christoph Steiner
45d1363a0e
tests/run-tests: use $sed var for all calls that need GNU sed
...
FreeBSD, macOS, and others come with BSD sed, which does not support all
the things that GNU sed does. Also, BSD rmdir does not have any extended
options like --ignore-fail-on-non-empty.
2023-12-13 22:30:19 +01:00
Michael Pöhn
bf73477d4c
Merge branch 'port-to-vendored-looseversion' into 'master'
...
port to vendored looseversion lib
See merge request fdroid/fdroidserver!1419
2023-12-08 11:18:30 +00:00
Hans-Christoph Steiner
e2949cbd61
port to looseversion
2023-12-08 10:48:01 +01:00
Hans-Christoph Steiner
4b208e438e
gitlab-ci: gradle job needs python3-packaging now
2023-12-08 10:42:29 +01:00
Hans-Christoph Steiner
ad9cabdab9
add looseversion license information to vendored file
2023-12-08 10:42:29 +01:00
Hans-Christoph Steiner
a1a88d39cf
download looseversion to vendor
...
e1a5a176a9/src/looseversion/__init__.py
2023-12-08 10:42:27 +01:00
Hans-Christoph Steiner
c4424a5e1a
Merge branch 'python3.12' into 'master'
...
Add support for Python 3.12
See merge request fdroid/fdroidserver!1403
2023-12-08 07:30:48 +00:00
Andrew Gunnerson
679ba6f552
Add support for Python 3.12
...
Python 3.12 completely removed the builtin `distutils` module. This
commit replaces its use with the `packaging` package, which is an
external dependency, but maintained by the Python developers.
Signed-off-by: Andrew Gunnerson <accounts+gitlab@chiller3.com>
2023-12-07 18:15:05 -05:00
Michael Pöhn
2fb8fc4879
Merge branch 'config-mirrors-yml' into 'master'
...
establish config/mirrors.yml as a way to set up mirrors
See merge request fdroid/fdroidserver!1417
2023-12-07 16:34:14 +00:00
Hans-Christoph Steiner
4536b130df
index: add datatype checking to mirrors: and config/mirrors.yml
2023-12-07 17:25:15 +01:00
Hans-Christoph Steiner
6d541e3ef6
establish config/mirrors.yml as a way to set up mirrors
...
The mirrors: entry in config.yml is great for quick access and shorter
mirror lists. Now that we are adding a lot more metadata to the mirrors,
including potentially the full text of the privacy policy, having this
in its own file should make these cases easier to manage.
2023-12-07 14:38:26 +01:00
Hans-Christoph Steiner
7a0dad6dfc
Merge branch 'master' into 'master'
...
Support `Uri.create()` syntax for maven repositories
Closes #1180
See merge request fdroid/fdroidserver!1412
2023-12-07 09:58:53 +00:00
Axel López
825f969652
Support Uri.create()
syntax for maven repositories
2023-12-07 01:30:59 +00:00
Hans-Christoph Steiner
4a8b6432a4
Merge branch 'lint' into 'master'
...
lint: remove check_bulletes_lists
See merge request fdroid/fdroidserver!1416
2023-12-06 16:01:22 +00:00
linsui
2081a9f2d2
lint: remove check_bulletes_lists
2023-12-06 23:35:55 +08:00
Michael Pöhn
baf4cd6b61
Merge branch 'gradle-release-checksums.py' into 'master'
...
update to gradle v8.5
See merge request fdroid/fdroidserver!1415
2023-12-01 13:29:37 +00:00
fdroid-bot
685983bfab
gradle v8.5
2023-11-30 19:13:01 +00:00
Hans-Christoph Steiner
a7142f787c
Merge branch 'fix-bandit-lint' into 'master'
...
🩹 fix bandit warning
See merge request fdroid/fdroidserver!1414
2023-11-30 19:12:29 +00:00
Michael Pöhn
ac2a3896aa
🩹 fix bandit warning
...
F-Droid server doesn't fetch pip dependencies directly from mercurial/hg
repositories. So https://data.safetycli.com/v/62044/f17/ is not
affecting us. Hence we can ingore it.
2023-11-30 17:49:55 +01:00
Hans-Christoph Steiner
304caa4b42
Merge branch 'deinit' into 'master'
...
add --force to git deinit
See merge request fdroid/fdroidserver!1411
2023-11-28 10:02:03 +00:00
linsui
e2e7782ef3
add --force to git deinit
2023-11-25 22:11:19 +08:00
Michael Pöhn
9b38690df6
Merge branch 'port-test-jq-to-gnu-sed' into 'master'
...
remove jq dependency in the tests, port to GNU sed
See merge request fdroid/fdroidserver!1410
2023-11-23 12:29:25 +00:00
Hans-Christoph Steiner
f13d9235ce
remove jq dependency in the tests, port to GNU sed
...
This avoids spreading the jq dependency to more places, like:
https://gitlab.com/eighthave/ansible-role-install-fdroidserver-dependencies/-/jobs/5559798360
And is helpful when porting to non-Debian platforms.
2023-11-23 12:24:49 +00:00
Michael Pöhn
4b5dd72674
Merge branch 'ruamel' into 'master'
...
set ruamel.yaml version to older than 1.17.22
See merge request fdroid/fdroidserver!1389
2023-11-23 12:24:32 +00:00
linsui
6a7a6e310b
set ruamel.yaml version to older than 1.17.22
...
Newer version changed the behavior
2023-11-23 12:17:56 +00:00
Jochen Sprickerhof
ecb6b599b6
Merge branch 'remove_glay_repotrunk' into 'master'
...
Remove --gplay option and UpdateCheckMode "RepoTrunk"
See merge request fdroid/fdroidserver!1402
2023-11-21 07:27:08 +00:00
Gregor Düster
b5424d40f1
[checkupdates] Remove UpdateCheckMode "RepoTrunk"
...
It's unclear whether this still works and we're not planning to maintain
it.
2023-11-21 07:18:17 +00:00
Gregor Düster
81fdba452a
[checkupdates] Remove --gplay option
...
It's unclear whether this still works and we're not planning to maintain
it.
2023-11-21 07:18:17 +00:00