kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-05 23:10:12 +01:00
Code Activity
6,086 Commits 1 Branch 59 Tags 41 MiB
3c148941f7
Commit Graph

6086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hans-Christoph Steiner
ded5d8c6ac Merge branch 'bugfix/auto-update-suffix' into 'master' 
AutoUpdateMode: Do not include + in suffix

Closes #700 and #248

See merge request fdroid/fdroidserver!661
 2020-01-02 13:27:12 +00:00
Gerhard Olsson
cf9bff1d56 AutoUpdateMode: Do not include + in suffix 
Add suffix to version only
 2020-01-02 13:27:12 +00:00
Marcus
619ccb8d5a Merge branch 'keep_cv' into 'master' 
keep CVC of an app out of the archive

Closes #385

See merge request fdroid/fdroidserver!701
 2020-01-01 14:48:28 +00:00
Marcus Hoffmann
83526e09a3 update: fix unarchiving of allowed disabled algorithm 
6d0b1bbe6fae0909683f2c6a154515bc4bfcb674 didn't handle the
allow_disabled_algorithm case at all, so we add it back.

This additionally fixes a (previously existing) bug where setting
allow_disabled_algorithms to True didn't move apks back from archive to
repo. Introduce a new test for this.

The disabled_algorithm archiving logic is still all over the place so
ideally that needs a future refactor.
 2020-01-01 15:25:43 +01:00
Marcus Hoffmann
a7a83e1ee3 update: keep CVC of an app out of the archive 
We want to keep the stable version (CV) of an app in /repo with highest
priority and only move it to /archive when ArchivePolicy is set to 0.

For this to work we need two changes here:

1) when sorting apks by version code we insert the apk corresponding to
the CVC of the app afterwards with highest priority. So when walking the
list of apks afterwards the CVC apk is always kept first.

2) Instead of the two pass algorithm of moving things back and forth to
the archive we instead figure out where each apk of an app goes in first
before actually moving them into the right place.

Fixes: fdroid/fdroidserver#385
 2020-01-01 15:25:43 +01:00
Marcus Hoffmann
7f6efa74f5 tests: add test for correctly handling CVC when archiving 2019-12-24 17:35:54 +01:00
Marcus Hoffmann
3403402fbc git force fetch tags 
The behaviour of fetching tags changed in git 2.20. We need to force
fetch tags to restore the earlier behaviour and make fdroid git
operations work with newer git versions.

Closes fdroid/fdroidserver#718
 2019-12-23 14:48:52 +01:00
Hans-Christoph Steiner
e9830fc4ab Merge branch 'faster_yaml' into 'master' 
metadata: use yaml C implementation when available

Closes #716

See merge request fdroid/fdroidserver!696
 2019-12-23 10:09:50 +00:00
Marcus Hoffmann
01d00d54ca metadata: use yaml C implementation when available 
This is an order of magnitude faster. Requires the C yaml bindings to be
installed.

Fixes fdroid/fdroidserver#716
 2019-12-23 01:59:33 +01:00
Marcus
bc4655f437 Merge branch 'remove_unused_function' into 'master' 
remove unused function

See merge request fdroid/fdroidserver!697
 2019-12-23 00:52:18 +00:00
Marcus Hoffmann
5642dc56ae remove unused function 
The users of this were removed years ago in
013315bf10.
 2019-12-23 01:29:06 +01:00
Marcus
44694a0bc7 Merge branch 'ndk20b' into 'master' 
Add NDK r20b

See merge request fdroid/fdroidserver!695
 2019-12-16 00:07:03 +00:00
Licaon_Kter
126f6bf839 Add NDK r20b 2019-12-16 00:07:03 +00:00
Michael Pöhn
d2481375bb Merge branch 'archive_description' into 'master' 
archive description

See merge request fdroid/fdroidserver!694
 2019-12-15 16:34:16 +00:00
Hans-Christoph Steiner
37ca21f6da
Merge branch 'hex_versionCode' into 'master' 
* hex_versionCode:
  checkupdates: split out vercode parsing into testable function
  Add unit test for string_is_integer()
  Support hex versionCode in build command line
  Support hex in versionCode

See merge request fdroid/fdroidserver!692
 2019-12-03 23:55:12 +01:00
Hans-Christoph Steiner
7d40e89341
checkupdates: split out vercode parsing into testable function 2019-12-03 23:51:48 +01:00
Jochen Sprickerhof
bbee2cf707 Add unit test for string_is_integer() 2019-12-03 21:49:44 +01:00
Hans-Christoph Steiner
492f12a7a8
nightly: set descriptions for repo and archive 2019-12-03 00:24:37 +01:00
Hans-Christoph Steiner
ddf1f8ea15
update: make default repo description translatable 2019-12-03 00:24:32 +01:00
Hans-Christoph Steiner
75639ba0e8
update: description is a hard requirement, set a default for archive 2019-12-03 00:23:56 +01:00
Jochen Sprickerhof
0e071a689d Support hex versionCode in build command line 
Example: fdroid build net.gaast.giggity:0x200
 2019-11-29 20:02:24 +01:00
Jochen Sprickerhof
b83c3c9e18 Support hex in versionCode 
Example: https://github.com/Wilm0r/giggity/blob/master/app/src/main/AndroidManifest.xml#L2
 2019-11-29 20:01:29 +01:00
Michael Pöhn
4d9ec479a0 Merge branch 'gradle6' into 'master' 
Gradle 6.0 & 6.0.1

Closes #710

See merge request fdroid/fdroidserver!691
 2019-11-26 10:04:04 +00:00
Licaon_Kter
d0449d9713 Gradle 6.0 & 6.0.1 2019-11-26 10:04:04 +00:00
Hans-Christoph Steiner
1f363a889d
jenkins-setup-build-environment: auto-detect RAM/CPU specs 
This lets this setup run on more basic hardware, like schweiger/vibi.
 2019-11-18 18:14:11 +01:00
Michael Pöhn
499d65f292 Merge branch 'some-fixes' into 'master' 
Some fixes

Closes #703

See merge request fdroid/fdroidserver!690
 2019-11-13 11:23:18 +00:00
Hans-Christoph Steiner
b95f66a806
scanner: only allow HTTPS versions of the whitelist 2019-11-13 11:59:24 +01:00
Hans-Christoph Steiner
e6bf586e74
common: make v2 signature message a debug message 
https://gitlab.com/fdroid/fdroidserver/issues/703#note_238122327
closes #703
 2019-11-13 11:59:23 +01:00
Hans-Christoph Steiner
3354e66bd3
common: use standard format tags when generating the log name 2019-11-13 11:59:20 +01:00
Hans-Christoph Steiner
2cbde77798
build: do not crash if SVN URL pre-validation fails; log error 
This is the problem:
https://jenkins.debian.net/job/reproducible_fdroid_build_apps/704/console
 2019-11-13 11:59:18 +01:00
relan
c74dc730dd Merge branch 'gradle-5.6.4' into 'master' 
Gradle 5.6.4

See merge request fdroid/fdroidserver!689
 2019-11-07 04:45:18 +00:00
Hans-Christoph Steiner
f7f9bea1f7
Gradle 5.6.4 
https://gitlab.com/fdroid/fdroidserver/-/jobs/342228827
https://gradle.org/release-checksums/
 2019-11-06 09:07:42 +01:00
Hans-Christoph Steiner
cca78114cb
gitlab-ci: fedora no longer installs difftools by default 2019-11-05 15:30:34 +01:00
Hans-Christoph Steiner
54b8302c94 Merge branch 'patch-2' into 'master' 
remove redundant google analytics match

See merge request fdroid/fdroidserver!688
 2019-11-04 09:06:41 +00:00
Mike Hardy
3648ef1f2e Update scanner.TestCase to match new regex regime 
scanning for analytics is now handled by firebase/play-services regexes
 2019-11-02 18:54:54 +00:00
Mike Hardy
3c398e2aa6 remove redundant google analytics match 
'google.*play.*services' and 'firebase' will catch both manners of including analytics I think
https://developers.google.com/android/guides/setup#split
https://firebase.google.com/support/release-notes/android#latest_sdk_versions

This has the desired side effect of also allowing the libre analytics library
'net.mikehardy:google-analytics-java' and 'net.mikehardy:google-analytics-java7'
 2019-11-02 18:40:58 +00:00
Hans-Christoph Steiner
d3df615ad1 Merge branch 'gradle563' into 'master' 
Gradle 5.6.3

See merge request fdroid/fdroidserver!687
 2019-10-30 20:41:21 +00:00
Licaon_Kter
828d164fb2 Gradle 5.6.3 2019-10-30 20:41:21 +00:00
Hans-Christoph Steiner
0a8af2c55f Merge branch 'fix-readline-in-srclibs' into 'master' 
build: fix bad regexs when removing signingConfig from srclibs

See merge request fdroid/fdroidserver!686
 2019-10-25 08:18:08 +00:00
Hans-Christoph Steiner
4ef3f96e27 Merge branch 'log-deploy-fix' into 'master' 
fix disappearing build logs when deploying

See merge request fdroid/fdroidserver!685
 2019-10-23 11:43:23 +00:00
Hans-Christoph Steiner
afaa24f2fd
build: fix bad regexs when removing signingConfig from srclibs 
I went through the source of all apps in fdroiddata for examples, and found
some that use readLine() for things totally unrelated to signingConfigs.

https://gitlab.com/fdroid/fdroiddata/merge_requests/4775#note_234132902
 2019-10-23 12:44:47 +02:00
Michael Pöhn
c954a14139 update.py: fix archiving .log.gz files 2019-10-23 11:04:07 +02:00
Michael Pöhn
7fa3c34e5b update tests for fixed log deployment+changelog 2019-10-15 15:19:18 +02:00
Michael Pöhn
d665106813 fix disappearing build logs when deploying 2019-10-15 14:28:45 +02:00
Hans-Christoph Steiner
6d11da5e13 Merge branch 'triple-t-2' into 'master' 
parse Triple-T v2.x layout

See merge request fdroid/fdroidserver!683
 2019-10-08 11:15:12 +00:00
Hans-Christoph Steiner
797003f9c6 Merge branch 'lint-allow-beerware-xskat' into 'master' 
lint: allow Beerware and XSkat licenses

See merge request fdroid/fdroidserver!684
 2019-10-07 11:26:34 +00:00
Hans-Christoph Steiner
a72904ee23
lint: allow Beerware and XSkat licenses 
These licenses were already in our repo.  The are not FSF- or OSI-approved,
but they are included in Debian.  So for now at least, we should maintain
them in our list until we have a clearer picture of how we should make the
list of licenses we support.

* fdroidserver!682
* https://github.com/spdx/license-list-XML/issues/876
* Beerware in Debian:
  https://metadata.ftp-master.debian.org/changelogs//main/libm/libmd/libmd_1.0.1-3_copyright
* XSkat in Debian:
  https://metadata.ftp-master.debian.org/changelogs//main/x/xskat/xskat_4.0-7_copyright
 2019-10-07 12:05:37 +02:00
Hans-Christoph Steiner
f8c954d89e Merge branch 'lint-url-improvements' into 'master' 
Lint URL improvements

See merge request fdroid/fdroidserver!681
 2019-10-07 08:36:18 +00:00
Hans-Christoph Steiner
5904aef5a7
update: parse Triple-T v2.x layout 
Thanks to the very nice example from Piwigo, included here under the GPLv3+
https://github.com/Piwigo/Piwigo-Android

https://gitlab.com/fdroid/fdroiddata/merge_requests/5579#note_225834868
 2019-10-04 14:11:40 +02:00
Hans-Christoph Steiner
a7dd7a812f
update: strip leading/tailing whitespace on author contact fields 
Whitespace is not valid in email addresses, URLs, or phone numbers, and the
triple-t/fastlane file format generally has a newline at the end.
 2019-10-04 11:33:39 +02:00