kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 10:40:12 +02:00
Code Activity
6,711 Commits 1 Branch 59 Tags 52 MiB
35cf7f289e
Commit Graph

6711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jochen Sprickerhof
35cf7f289e Merge branch 'fix_gotorevisionx' into 'master' 
Ignore git submodule failure in gotorevisionx

See merge request fdroid/fdroidserver!955
 2021-06-16 09:02:02 +00:00
Jochen Sprickerhof
3809b4d424 Ignore git submodule failure in gotorevisionx 
gotorevisionx tries to clean up the git repo before checking out a new
revision. In b848b99ba this was changed to reset and clean any submodule
as well. In case upstream has a broken submodule configuration this
could fail and we can't checkout the new revision. As we are doing a
reset and clean after checking out the new revision anyhow, this change
ignores submodule errors before the checkout and only makes sure that
the main repo is reset and clean.

This broke checkupdates for apps where old versions had broken
submodules. It checkout out the old version and got stuck, not able to
checkout any other version.
 2021-06-15 20:39:18 +02:00
Jochen Sprickerhof
02a63a2ec0 Merge branch 'emtpy_checkupdatedata' into 'master' 
[checkupdates] UpdateCheckData tag for verocode if no regex

See merge request fdroid/fdroidserver!962
 2021-06-15 18:21:53 +00:00
Jochen Sprickerhof
cebdcdd67c [checkupdates] UpdateCheckData tag for verocode if no regex 
Use the tag as the version code if no regex was specified. This allows:

UpdateCheckData: '|||'

meaning the tag should be used for version code and name.
 2021-06-15 19:27:29 +02:00
Hans-Christoph Steiner
0c484f927e Merge branch 'gradle-release-checksums.py' into 'master' 
update to gradle v7.1

See merge request fdroid/fdroidserver!959
 2021-06-15 10:45:52 +00:00
fdroid-bot
da820ace2e gradle v7.1 2021-06-15 06:54:38 +00:00
Jochen Sprickerhof
188e163b1a Merge branch 'tag_sort_version' into 'master' 
latesttags revert to git log and fix comma handling

See merge request fdroid/fdroidserver!960
 2021-06-15 06:53:58 +00:00
Jochen Sprickerhof
4e97b58d8c latesttags revert to git log and fix comma handling 
2de34312 tried to fix the comma handling by relying on git tag --sort.
This did not work out so this reverts to the method used before.
 2021-06-15 08:39:59 +02:00
Jochen Sprickerhof
09987f1fc7 Merge branch 'git_latesttags' into 'master' 
Use git tag in latesttags

See merge request fdroid/fdroidserver!954
 2021-06-14 18:56:59 +00:00
Jochen Sprickerhof
2de3431296 Use git tag in latesttags 2021-06-14 18:56:59 +00:00
Hans-Christoph Steiner
89762f4d48 Merge branch 'fix_flavour' into 'master' 
Fix matching substring flavour detection

Closes #899 and #912

See merge request fdroid/fdroidserver!957
 2021-06-14 12:49:45 +00:00
Jochen Sprickerhof
1e6de7eb34 Support '{' in extra line in parse_androidmanifests 
If the flavour group starts in a separate line don't count it as a
second group.

Closes: #899
 2021-06-13 07:23:42 +02:00
Jochen Sprickerhof
0fefecde1e Fix matching substring flavour detection 
com.github.jameshnsears.quoteunquote defines flavours 'fdroid' and
'fdroidS'. The old code used flavour in line, which matches both and the
wrong one was selected.

Closes: #912
 2021-06-13 00:09:02 +02:00
Hans-Christoph Steiner
a21c2c5ff1 Merge branch 'fix_pathlib' into 'master' 
[lint] convert path to Path first

See merge request fdroid/fdroidserver!953
 2021-06-09 17:08:47 +00:00
Jochen Sprickerhof
46ebdd701a [lint] convert path to Path first 
Fixes a lot of undetected extlibs.
Regression of 6bafb036.
 2021-06-09 17:49:59 +02:00
Jochen Sprickerhof
14cfa11b68 Merge branch 'tag_UpdateCheckData' into 'master' 
[checkupdates] UpdateCheckData use tag as default version

See merge request fdroid/fdroidserver!949
 2021-06-09 12:20:15 +00:00
Jochen Sprickerhof
bdec7d8652 [checkupdates] UpdateCheckData use tag by default 
Use the tag as version, if no version file was specified:

UpdateCheckData: app/build.gradle|versionCode\s(\d+)||

Extract version from tag, if a regex was specified:

UpdateCheckData: app/build.gradle|versionCode\s(\d+)||Android-([\d.]+)

Use the tag for both if no file was specified:

UpdateCheckData: |\+(\d+)||Android-([\d.]+)
 2021-06-09 14:02:02 +02:00
Hans-Christoph Steiner
b7a4883c09 Merge branch 'fix_versioncode_regex' into 'master' 
Don't allow '_' in first place of version code

See merge request fdroid/fdroidserver!950
 2021-06-09 11:16:32 +00:00
Jochen Sprickerhof
a9a336a12b Don't allow '_' in first place of version code 
Fixes a regression of 2cb0ff45. Example:

versionCode project.versionCode_plus

931b0a3087/app/build.gradle (L38)
 2021-06-09 11:04:25 +00:00
Hans-Christoph Steiner
a946ae2b44 Merge branch 'as_posix' into 'master' 
use .as_posix() to convert to posix path str

See merge request fdroid/fdroidserver!946
 2021-06-09 11:03:04 +00:00
linsui
bf9cbc87a9 use .as_posix() 2021-06-09 10:51:28 +00:00
Hans-Christoph Steiner
86b053291d Merge branch 'mypy-from-debian' into 'master' 
gitlab-ci: use mypy from Debian/bullseye to prevent random breakage

See merge request fdroid/fdroidserver!952
 2021-06-09 10:51:12 +00:00
Hans-Christoph Steiner
ac86a2af89
gitlab-ci: use mypy from Debian/bullseye to prevent random breakage 
mypy 0.901 was released and everything broke:
https://gitlab.com/linsui/fdroidserver/-/jobs/1330206567

My point is to reduce the number of false job fails like this one. We
have a lot of checkers running, I really think they need to prove they are
adding value before we invest any time maintaining them. mypy is still
"wait and see" in terms of the adding any value.

!951
 2021-06-09 12:35:50 +02:00
Hans-Christoph Steiner
bcd3e89614
gitlab-ci: fix whitespace 2021-06-09 12:25:00 +02:00
Jochen Sprickerhof
799ceda731 Merge branch 'fix_UpdateCheckData' into 'master' 
[checkupdates] UpdateCheckData warn if file was not found

See merge request fdroid/fdroidserver!948
 2021-06-09 10:09:45 +00:00
Jochen Sprickerhof
69a0a7da39 [checkupdates] UpdateCheckData warn if file was not found 
Instead of throwing an exception.
 2021-06-09 11:52:11 +02:00
Hans-Christoph Steiner
2bdd569eb0 Merge branch 'lint' into 'master' 
lint.py: use pathlib and support Windows

See merge request fdroid/fdroidserver!947
 2021-06-09 08:53:38 +00:00
linsui
6bafb036ee lint.py: use pathlib and support Windows 2021-06-09 15:46:52 +08:00
Hans-Christoph Steiner
8b17fbf703 Merge branch 'metadata' into 'master' 
metadata.py: use pathlib and support Windows

See merge request fdroid/fdroidserver!939
 2021-06-08 15:02:54 +00:00
Hans-Christoph Steiner
490f578d1c remove redundant call to Path() 2021-06-08 16:50:48 +02:00
linsui
8f21f1e510 metadata.py/rewritemeta.py: use pathlib and support Windows 2021-06-08 21:31:55 +08:00
Hans-Christoph Steiner
5635815898 Merge branch 'import' into 'master' 
import: use pathlib and support Windows

See merge request fdroid/fdroidserver!938
 2021-06-08 11:10:17 +00:00
linsui
d6eece6395 import.py: use pathlib and support Windows 2021-06-08 18:33:22 +08:00
Jochen Sprickerhof
7ddcbb3e80 Merge branch 'lint_tag_UpdateCheckData' into 'master' 
[lint] only check for https with UpdateCheckMode HTTP

See merge request fdroid/fdroidserver!944
 2021-06-07 17:07:43 +00:00
Jochen Sprickerhof
49248ba3a9 [lint] only check for https with UpdateCheckMode HTTP 
With 133b626b UpdateCheckMode is now also allowed with Tags but it uses
the files from the local repo.
 2021-06-07 18:55:42 +02:00
Jochen Sprickerhof
b6233fa2ce Merge branch 'fix_check_tags' into 'master' 
[checkupdates] handle non matching regex

See merge request fdroid/fdroidserver!943
 2021-06-07 16:12:19 +00:00
Jochen Sprickerhof
a74922f56e [checkupdates] handle non matching regex 2021-06-07 17:59:43 +02:00
Jochen Sprickerhof
15a15420f7 Merge branch 'pathlib' into 'master' 
fix tests for !935

See merge request fdroid/fdroidserver!942
 2021-06-07 15:45:34 +00:00
linsui
84b74d481e fix tests for !935 2021-06-07 15:33:57 +00:00
Jochen Sprickerhof
3acaa7ede5 Merge branch 'pathlib' into 'master' 
checkupdates.py: use pathlib and support Windows

See merge request fdroid/fdroidserver!935
 2021-06-07 13:38:21 +00:00
linsui
92ec6265a3 checkupdates.py: use pathlib and support Windows 2021-06-07 21:02:03 +08:00
Jochen Sprickerhof
023319efbb Merge branch 'tag_UpdateCheckData' into 'master' 
Tag update check data

See merge request fdroid/fdroidserver!937
 2021-06-07 12:00:22 +00:00
Jochen Sprickerhof
ed2da42eff Support hex in versionCode with UCM RepoManifest 
Same a b83c3c9e.
 2021-06-07 13:47:18 +02:00
Jochen Sprickerhof
133b626b22 Support UpdateCheckData in check_tags 2021-06-07 13:47:18 +02:00
Jochen Sprickerhof
ba2b236e7b Drop unused package id check 2021-06-07 13:47:18 +02:00
Hans-Christoph Steiner
d05ff9db1d
easy changes to black code format in test cases 
This does not change areas of code that should be manually reformatted.
 2021-06-07 11:53:58 +02:00
Hans-Christoph Steiner
d95a3029a8 Merge branch 'master' into 'master' 
tests/ndk-release-checksums.py: fix parsing of NDK r10e

See merge request fdroid/fdroidserver!941
 2021-06-07 08:10:43 +00:00
Hans-Christoph Steiner
cb09a16133
tests/ndk-release-checksums.py: fix parsing of NDK r10e 
This wasn't finding r10e properly, so it would submit merge requests
to remove r10e from _fdroidserver_.

* !940
* !930
 2021-06-07 09:58:12 +02:00
Hans-Christoph Steiner
d060a8c691 Merge branch 'yashpalgoyal1304-master-patch-36117' into 'master' 
Added missing linebreak

See merge request fdroid/fdroidserver!936
 2021-06-07 07:37:46 +00:00
Teen
faa15f336c Added missing linebreak 2021-06-04 17:29:56 +00:00