Hans-Christoph Steiner
4a362541bd
Merge branch 'gh-releases' into 'master'
...
🛰️ deploy: github releases
See merge request fdroid/fdroidserver!1471
2024-06-28 13:21:55 +00:00
Michael Pöhn
0fa88c5c20
💇 implement review nits
...
Implement review nits as requested bei @eighthave in
https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1471
2024-06-27 12:28:54 +02:00
Michael Pöhn
3cf3685280
🐐 appeace bandint security warnings
...
In this particular case bandit was complaining about potential path
escape exploits on urlopen. However the urls are safe enough, because
all template parameters inserted into the url are from:
* config.yml - malicious changes to config.yml are possible that's
already a lot bigger issue than this than redirecting github api
calls.
* git tags witch are present in bot the local index-v2.json file (as
versionName) and the remote github API. (git tags don't allow the
string '..')
2024-06-27 12:28:41 +02:00
Michael Pöhn
aca98c1355
🏏 incorporate review feedback
2024-06-27 12:28:29 +02:00
Michael Pöhn
a87284cf80
🚥 deploy: tests for github releases deploy functions
...
Add test cases for github releases function in deploy.py
2024-06-27 12:28:16 +02:00
Michael Pöhn
242490ddc3
🎯 deploy: no releaseChannels on github releases
...
Don't deploy versions of to GitHub releases where a `releaseChannels`
value is set in index-v2.json. (This usually would mean it's a alpha or
beta version.)
2024-06-27 12:28:04 +02:00
Michael Pöhn
c6598f2835
☄️ deploy: github releases - whatsNew text as note
...
Use whatsNew text (if available) as release notes text when deploying to
Github releases. This feature will always use 'en-US' locale texts,
since English is the lingua franka on GitHub. Additionally this change
also adds a config option to preprend a static text to those release
notes.
2024-06-27 12:27:51 +02:00
Michael Pöhn
a079f9d85f
♟️ deploy: add global config github_token
2024-06-27 12:27:39 +02:00
Michael Pöhn
7a6fa7f816
🛄 deploy: separate function for release file lookup
2024-06-27 12:27:27 +02:00
Michael Pöhn
44b0af933d
🎡 add unit tests for github.py
...
add unittests for our github api calls
2024-06-27 12:27:15 +02:00
Michael Pöhn
1b19293ab0
🛰️ deploy: github releases
...
Implemented basic support for using `fdroid delpoy` to upload APKs from
the repo to GitHub releases.
2024-06-27 12:27:01 +02:00
Hans-Christoph Steiner
aeb8a7a3e5
Merge branch 'fix-subprocess-checkoutput-on-rclone' into 'master'
...
fix: subprocess.check_output to produce string and not bytes
See merge request fdroid/fdroidserver!1490
2024-06-12 06:31:49 +00:00
pmmayero
8255dec6b8
fix: jinja 2 CVE
2024-06-12 06:30:27 +00:00
pmmayero
3f59d0908f
fix: subprocess.check_output to produce string and not bytes
2024-06-12 06:30:27 +00:00
Hans-Christoph Steiner
21e03e62a8
Merge branch 'index-only-deploy-mode' into 'master'
...
Add index only deployment mode
Closes #1181
See merge request fdroid/fdroidserver!1420
2024-06-11 17:46:00 +00:00
proletarius101
845ed3ef47
Add index only deployment mode
2024-06-11 17:45:59 +00:00
Hans-Christoph Steiner
24b3b0957f
Merge branch 'safety-false-positive' into 'master'
...
safety: ignore false positive
See merge request fdroid/fdroidserver!1492
2024-06-07 10:15:32 +00:00
Hans-Christoph Steiner
6e489b78b3
safety: ignore false positive
...
jinja2 is not used by fdroidserver, nor any dependencies I could find via
debtree and pipdeptree.
2024-06-07 12:04:12 +02:00
Hans-Christoph Steiner
e7ff344f2b
Merge branch 'gradle' into 'master'
...
gradle 8.8
See merge request fdroid/fdroidserver!1489
2024-06-05 15:00:19 +00:00
linsui
41e90e5ee7
gradle 8.8
2024-06-01 16:24:26 +08:00
Hans-Christoph Steiner
f50e5a806d
Merge branch 'switching-s3cmd-for-rclone' into 'master'
...
Adding rclone as an option to fdroid deploy
Closes #1095
See merge request fdroid/fdroidserver!1095
2024-05-29 14:08:07 +00:00
paul mayero
7aabfbcbf0
Adding rclone as an option to fdroid deploy
2024-05-29 14:08:07 +00:00
Hans-Christoph Steiner
eadbf06d48
Merge branch 'licaon-kter-master-patch-05845' into 'master'
...
Fix more tests after !1487
See merge request fdroid/fdroidserver!1488
2024-05-23 08:30:36 +00:00
Licaon_Kter
feafe2812d
Fix more tests after !1487
2024-05-22 13:40:27 +00:00
Hans-Christoph Steiner
b3748aa3f1
Merge branch 'scannerid' into 'master'
...
scanner - pickup by id, sort list
See merge request fdroid/fdroidserver!1487
2024-05-22 09:26:13 +00:00
Licaon_Kter
98f935493e
fix test cases
2024-05-22 09:25:49 +00:00
Licaon_Kter
df97ebe052
scanner - pickup by id, sort list
2024-05-22 09:25:49 +00:00
Hans-Christoph Steiner
18c9bc6e01
Merge branch 'sdkmanager-bookworm-backports' into 'master'
...
buildserver: use sdkmanager from backports
See merge request fdroid/fdroidserver!1475
2024-05-20 18:36:40 +00:00
Hans-Christoph Steiner
afb9b7570e
buildserver: use sdkmanager from backports
2024-05-20 18:36:33 +00:00
Hans-Christoph Steiner
25b1a77424
fix merge conflict with https://hosted.weblate.org/projects/f-droid/fdroidserver/
2024-05-14 12:22:56 +02:00
Hans-Christoph Steiner
4c0fa1d0a9
Merge branch 'update-pot' into 'master'
...
make -C locale update
See merge request fdroid/fdroidserver!1484
2024-05-13 12:10:49 +00:00
Hans-Christoph Steiner
c37a26bcd2
make -C locale update
2024-05-13 13:59:52 +02:00
Hans-Christoph Steiner
b45b31b927
version 2.3 alpha 1
2024-05-13 10:45:09 +02:00
Hans-Christoph Steiner
2f148b4407
Merge branch 'weblate' into 'master'
...
weblate
See merge request fdroid/fdroidserver!1483
2024-05-13 08:44:31 +00:00
Hans-Christoph Steiner
6bebd8b160
safety: ignore CVE-2018-20225, should never affect fdroidserver
...
https://data.safetycli.com/v/67599/97c
2024-05-13 10:33:37 +02:00
Fjuro
7e1b2e0788
Translated using Weblate: Czech (cs) by Fjuro <fjuro@alius.cz>
...
Currently translated at 100.0% (552 of 552 strings)
Co-authored-by: Fjuro <fjuro@alius.cz>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/cs/
Translation: F-Droid/F-Droid Server
2024-05-13 10:25:52 +02:00
Random
34dd9a75e4
Translated using Weblate: Italian (it) by Random <random-r@users.noreply.hosted.weblate.org>
...
Currently translated at 100.0% (552 of 552 strings)
Co-authored-by: Random <random-r@users.noreply.hosted.weblate.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/it/
Translation: F-Droid/F-Droid Server
2024-05-13 10:25:43 +02:00
ALoLo_527
f6235831ae
Translated using Weblate: Chinese (Simplified) (zh_Hans) by ALoLo_527 <ALoLo@users.noreply.hosted.weblate.org>
...
Currently translated at 82.0% (453 of 552 strings)
Co-authored-by: ALoLo_527 <ALoLo@users.noreply.hosted.weblate.org>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hans/
Translation: F-Droid/F-Droid Server
2024-05-13 10:25:35 +02:00
Oğuz Ersen
99841bf7c5
Translated using Weblate: Turkish (tr) by Oğuz Ersen <oguz@ersen.moe>
...
Currently translated at 100.0% (552 of 552 strings)
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/tr/
Translation: F-Droid/F-Droid Server
2024-05-13 10:25:03 +02:00
Agnieszka C
c7f1bdd14c
Translated using Weblate: Polish (pl) by Agnieszka C <aga_04@o2.pl>
...
Currently translated at 100.0% (552 of 552 strings)
Co-authored-by: Agnieszka C <aga_04@o2.pl>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/pl/
Translation: F-Droid/F-Droid Server
2024-05-13 10:24:56 +02:00
gallegonovato
25278801de
Translated using Weblate: Spanish (es) by gallegonovato <fran-carro@hotmail.es>
...
Currently translated at 100.0% (552 of 552 strings)
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/es/
Translation: F-Droid/F-Droid Server
2024-05-13 10:24:45 +02:00
Michael Pöhn
8d9c048505
Merge branch 'config-options-as-module-level-variables' into 'master'
...
clarify that 'config' and 'options' should only be module-level variables
See merge request fdroid/fdroidserver!1477
2024-05-08 14:47:49 +00:00
Hans-Christoph Steiner
64c9154fff
gitlab-ci: fix macOS job after !1466
2024-05-08 16:36:21 +02:00
Hans-Christoph Steiner
5745ed4753
common: only try to delete .testfiles dir if it exists
...
Otherwise, some tests fail with an error.
2024-05-08 16:28:14 +02:00
Hans-Christoph Steiner
18f3acc32e
split out options from read_config()
...
There is no longer any reason for these to be intertwined.
This deliberately avoids touching some files as much as possible because
they are super tangled and due to be replaced. Those files are:
* fdroidserver/build.py
* fdroidserver/update.py
# Conflicts:
# tests/testcommon.py
# Conflicts:
# fdroidserver/btlog.py
# fdroidserver/import_subcommand.py
2024-05-08 16:26:46 +02:00
Hans-Christoph Steiner
685efa23d4
import: always load testcommon from localmodule
...
Having this import before sys.path.insert() made it load testcommon from
the Debian package.
2024-05-08 16:19:27 +02:00
Hans-Christoph Steiner
1e5699e90c
remove all references to optparse (deprecated since Python 3.2)
2024-05-08 16:19:27 +02:00
Hans-Christoph Steiner
717df09be0
clarify that config/options can be global or module-level variable
2024-05-08 16:19:27 +02:00
Hans-Christoph Steiner
92a3f4b191
rename local variable to stop overwriting global options
...
This fixes a bug where if smartcardoptions is set as a str in config.yml
will overwrite all command line options.
a4d069862
2024-05-08 16:19:27 +02:00
Hans-Christoph Steiner
1eaba25021
common: do not use module reference for local functions
...
This just makes things more confusing.
2024-05-08 16:19:27 +02:00
