1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-08 10:10:10 +02:00
Commit Graph

5213 Commits

Author SHA1 Message Date
Hans-Christoph Steiner
a9cc7f6358 update translation template with latest strings 2018-07-17 12:37:13 +02:00
Hans-Christoph Steiner
56a5d868f1 update: purge --editor and --interactive, they were removed in 2013
48296df5b0
2018-07-17 12:37:13 +02:00
Hans-Christoph Steiner
be54f1e82a Merge branch 'improve_gradlew-fdroid' into 'master'
Improve gradlew fdroid

See merge request fdroid/fdroidserver!535
2018-07-13 16:53:50 +00:00
Marcus Hoffmann
7023f372fd gradlew-fdroid: tabs -> spaces
We have everything indented with spaces. Don't make an exception for
shell scripts.
2018-07-13 17:02:48 +02:00
Marcus Hoffmann
03e9fe4b38 gradlew-fdroid: save downloads with proper name
This makes re-using them for makebuildserver possible
2018-07-13 17:01:14 +02:00
Marcus Hoffmann
51ef9a8a99 gradlew-fdroid; print which gradle binary is actually running 2018-07-13 17:00:45 +02:00
Marcus
449b4ef7a2 Merge branch 'fix_519' into 'master'
Fix 519

Closes #519

See merge request fdroid/fdroidserver!534
2018-07-13 14:28:36 +00:00
Marcus Hoffmann
19a017c88d gradlew-fdroid: don't print available versions
It's not really useful information and can be gathered from the used
fdroidserver commit in any case.
2018-07-13 16:03:38 +02:00
Marcus Hoffmann
377c50fc53 gradlew-fdroid: make sure cachedir exists
Closes fdroid/fdroidserver#519
2018-07-13 16:02:58 +02:00
Michael Pöhn
b6ad6724cc Revert "publish: avoid double removal of dev-supplied reference binary"
This reverts commit db5ed26517.

Doh, messed up the rebase...
2018-07-13 00:07:58 +02:00
Hans-Christoph Steiner
b0e9a25abd Merge branch 'subdir-for-reprod-apks' into 'master'
put .binary.apk files into sub-directory

another shot at #509

See merge request fdroid/fdroidserver!533
2018-07-12 23:53:37 +02:00
Hans-Christoph Steiner
64b999ca19 publish: test case that successfully verifies based on Binaries:
This is a stupid test of the process just to exercise the most basic path.
It should always succeed since it is verifying two copes of the same APK.
2018-07-12 23:53:05 +02:00
Hans-Christoph Steiner
58b81b5ca6 publish: strict regex replacement for .binary.apk
. matches anything \. matches the char "."
2018-07-12 23:53:05 +02:00
Hans-Christoph Steiner
68fb3d2bd9 fix typos 2018-07-12 23:53:05 +02:00
Michael Pöhn
db5ed26517 publish: avoid double removal of dev-supplied reference binary 2018-07-12 23:53:05 +02:00
Michael Pöhn
cdc2147de9 put .binary.apk files into sub-directory 2018-07-12 23:52:46 +02:00
Michael Pöhn
fab02a49dc Merge branch 'better_gradle_support' into 'master'
Better gradle support

Closes #98

See merge request fdroid/fdroidserver!527
2018-07-11 15:20:19 +00:00
Marcus Hoffmann
34b698aa45
hooks: add gradlew-fdroid to BASH_FILES 2018-07-11 11:49:41 +02:00
Marcus Hoffmann
9889a98dea
build: improve gradle experience
This expands the gradle wrapper shell script used by the buildserver for
usage outside the buildserver environment. It also allows downloading
whitelisted versions of gradle if they are not yet deployed to the
buildserver by simply upsating the copy of fdroidserver (in contrast to
having to reprovision the whole buildserver).

We first move the buildserver/gradle shell script to the repo root
as gradlew-fdroid, as it's an fdroid specific gradle wrapper.
We also now sync it inside the build VM before each build.

We then add a list of whitelisted gradle distributions taken from the
makebuildserver script.

The script additionally now reads two env vars which tell it where to
expect installed versions of gradle and where it might store downloaded
gradle .zip files. Both of those are configurable from config.py. As the
first should normally just be a subdir of the second it's not exposed in
the example config.py but only used by the buildserver config.py.

Default config now uses this internal gradle wrapper but a path to a
custom wrapper or specific gradle distribution can still be set from
config.py.

Closes fdroid/fdroidserver#98
Ref: fdroid/fdroidserver#370
2018-07-11 11:49:46 +02:00
Hans-Christoph Steiner
7dae36399d Merge branch 'master' into 'master'
NoSourceSince Anti-Feature should only be added to index

See merge request fdroid/fdroidserver!532
2018-07-10 22:10:09 +00:00
Hans-Christoph Steiner
e3bd293f43 gitlab-ci: point to fixed NoSourceSince commit 2018-07-10 23:48:25 +02:00
Hans-Christoph Steiner
b03c4a7353 NoSourceSince Anti-Feature should only be added to index
Before, it was being added to the metadata, so that rewritemeta would
output it.

fdroid/fdroidserver!529
#508
2018-07-10 23:32:07 +02:00
Hans-Christoph Steiner
6ca09e1bb2 gitlab-ci: update metadata_v0 test for latest metadata fields
This is a lot easier than trying to do some elaborate multiline sed regexp!

https://gitlab.com/fdroid/fdroidserver/merge_requests/529#note_86955227
2018-07-10 17:26:07 +02:00
Hans-Christoph Steiner
90e3a67cef Merge branch 'sourcegone' into 'master'
new AntiFeature: SourceGone (automatically set at NoSourceSince). closes #508

Closes #508

See merge request fdroid/fdroidserver!529
2018-07-10 12:36:49 +00:00
Izzy
5d8e1bde4f new AntiFeature: SourceGone (automatically set at NoSourceSince). closes #508 2018-07-10 12:36:49 +00:00
Marcus Hoffmann
68cb81f38d
gitignore: add .idea dir 2018-07-09 17:59:32 +02:00
Hans-Christoph Steiner
4f7a992214 Merge branch 'fix_notarball' into 'master'
build: propagate --no-tarball option to buildserver

Closes #510

See merge request fdroid/fdroidserver!528
2018-07-09 15:01:09 +00:00
Marcus Hoffmann
a728582077
build: propagate --no-tarball option to buildserver
Closes #510
2018-07-09 14:48:59 +02:00
Marcus
a10957942f Merge branch 'ndkr17b_fix2' into 'master'
ndk17: add to extract whitelist

See merge request fdroid/fdroidserver!526
2018-07-04 12:33:18 +00:00
Marcus Hoffmann
a1ea29c86b
ndk17: add to extract whitelist 2018-07-04 14:30:15 +02:00
Michael Pöhn
b3e3aa6e0e Merge branch '509-Error-publishing-an-apk' into 'master'
Resolve "Error publishing an apk"

See merge request fdroid/fdroidserver!525
2018-07-02 23:04:12 +00:00
Michael Pöhn
5726432159 fix ignoring developer supplied reference apks for reproducible builds when publishing 2018-07-02 15:28:22 +02:00
Marcus
1ee90d05e2 Merge branch 'ndk17b' into 'master'
Ndk17b

See merge request fdroid/fdroidserver!524
2018-06-27 14:47:51 +00:00
Marcus Hoffmann
b3bfb3ac21
examples/config.py: add ndk r17b entry 2018-06-27 16:46:38 +02:00
Marcus Hoffmann
2757bd2093
buildserver config: add ndk r17b entry 2018-06-27 16:45:42 +02:00
Marcus
2f4e5dd868 Merge branch 'makebuildserver_upgrades' into 'master'
Makebuildserver upgrades

Closes #506

See merge request fdroid/fdroidserver!523
2018-06-26 13:50:57 +00:00
Marcus Hoffmann
9ab7adcfbb
makebuildserver: upgrade ndk r17 to r17b 2018-06-26 15:23:48 +02:00
Marcus Hoffmann
297a1eb542
makebuildserver: add gradle 4.8.1
Closes fdroid/fdroidserver#506
2018-06-26 15:23:43 +02:00
Marcus Hoffmann
50660e44fc
makebuildserver: add build-tools_r28 2018-06-26 15:19:17 +02:00
Marcus Hoffmann
2a2058c2f9
makebuildserver: add platform-28 2018-06-26 15:05:12 +02:00
Hans-Christoph Steiner
abb3a0bfb6 Merge branch 'nonstandardwebroot-warning' into 'master'
add extra explanation/warning to nonstandardwebroot in examples/config.py

See merge request fdroid/fdroidserver!522
2018-06-26 09:35:58 +00:00
Michael Pöhn
931ec12b82 add extra explanation/warning to nonstandardwebroot in examples/config.py 2018-06-26 11:31:52 +02:00
Michael Pöhn
1cca767a6b Merge branch 'master' into 'master'
1.0 polish

See merge request fdroid/fdroidserver!521
2018-06-25 19:58:12 +00:00
Hans-Christoph Steiner
d20e8613fe build: only test for all Android SDK paths where it is needed
Now that androguard can be used, the android-sdk is no longer required for
most operations.
2018-06-25 10:52:12 +02:00
Hans-Christoph Steiner
669401640a tests: only run gpgsign tests if gpg is present and executable
This allows the full test suite to run in Debian/Ubuntu autopkgtest with
only the Depends: installed, and nothing from Recommends:.
2018-06-25 10:52:12 +02:00
Hans-Christoph Steiner
c3b361c91b remove 'from distutils.util import strtobool' dependency
Most of distutils is being removed from the Python standard library, and
this is totally not needed here.
2018-06-25 10:52:12 +02:00
Hans-Christoph Steiner
d28dd3f64d bump to 1.1a 2018-06-25 10:52:07 +02:00
Michael Pöhn
b80154da86 Merge branch 'fix-left-out-refactoring-in-build-py' into 'master'
fix left out refactoring in build.py

See merge request fdroid/fdroidserver!520
2018-06-23 21:51:42 +00:00
Michael Pöhn
12af173821 fix left out refactoring in build.py 2018-06-23 23:26:42 +02:00
Hans-Christoph Steiner
3e62b29e96 Merge branch 'master' into 'master'
two fixes and two new flags for `fdroid nightly

Closes #288

See merge request fdroid/fdroidserver!519
2018-06-20 14:32:02 +00:00