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

4959 Commits

Author SHA1 Message Date
Hans-Christoph Steiner
43b990505d travis-ci: only run one round of the test suite on OSX
The OSX tests seem to run slower, they often timeout.  So only run
the test suite with the installed version of fdroid, instead of the
three rounds that ./complete-ci-tests does.
2017-10-25 23:01:25 +02:00
Hans-Christoph Steiner
ab02a6fcc3 Revert "scanner: promote jar and aar files present in the repo to errors"
This reverts commit 5f5d3ea896.

These new scanner rules for JARs causes most builds on fdroiddata to
break.  For example, at least the past 20 releases of
org.fdroid.fdroid.  fdroiddata needs to be cleaned up and prepared for
this before we can include 5f5d3ea896

I'm running fdroid scanner on the whole archive now, I'll post the log
to an issue once its done.  Ignoring test files would eliminate some
of these build failures, at least for most org.fdroid.fdroid builds.

refs #!325
2017-10-25 22:55:47 +02:00
Marcus
fde964479d Merge branch 'makebuildserver/default_memory' into 'master'
makebuildserver: change mem default 4 GB

See merge request fdroid/fdroidserver!358
2017-10-25 12:41:25 +00:00
Marcus Hoffmann
f9444386e6 makebuildserver: change mem default 2 GB
1 GB is not enough for a modern android toolchain, so we change it to
something actually usable.
2017-10-25 14:13:35 +02:00
Hans-Christoph Steiner
23265e3290 Merge branch 'patch-1' into 'master'
HTTP, HTTPS

See merge request fdroid/fdroidserver!360
2017-10-24 13:40:53 +00:00
Marcus Hoffmann
e307cdec59 common: check file existence before opening manifest
This fixes a problem when there is a broken symlink with the name
AndroidManifest.xml which will then lead to a crash when trying to open
it for trying to remove the debuggable flag.
2017-10-24 15:19:38 +02:00
Hans-Christoph Steiner
95c5b0840c Merge branch 'deploy-localization-support' into 'master'
Deploy localization support

See merge request fdroid/fdroidserver!356
2017-10-23 10:27:22 +00:00
Allan Nordhøy
6daeb88ab9 HTTP, HTTPS 2017-10-22 06:43:18 +00:00
Hans-Christoph Steiner
55a24dc408 Merge branch 'remove_basebox_ref' into 'master'
makebuildserver: remove reference to f-droid.org/jessie64.box

See merge request fdroid/fdroidserver!357
2017-10-20 19:54:50 +00:00
Marcus Hoffmann
7859244ce7 makebuildserver: remove reference to f-droid.org/jessie64.box
Also improve error message when the initial vagrant up fails, this is
most likely due to the missing jessie64.box file.
2017-10-20 04:41:50 +02:00
Hans-Christoph Steiner
4ff50e9099 fix egg-link and easy_install support for Python3
Wow, this is hacky and weird, but its been there for a long time. I
don't know if its even relevant anymore, but is isolated so it
shouldn't hurt anything.  Plus there is a test for it in
tests/complete-ci-tests, so it seems worth fixing.
2017-10-19 23:28:13 +02:00
Hans-Christoph Steiner
cc6d867423 fix finding translation files when installed 2017-10-19 23:28:13 +02:00
Hans-Christoph Steiner
0300553020 add some context to some strings that are confusing to translators 2017-10-19 23:28:13 +02:00
Hans-Christoph Steiner
f227af817f standardize on "build-tools" as the name of that Android SDK component 2017-10-19 23:28:13 +02:00
Hans-Christoph Steiner
35c7c1e805 update localization source files with make -C locale
* `make -C locale` updates all the sources
* `make -C locale compile` can compile the binaries, but the preferred way
  is `python3 setup.py compile_catalog`.
2017-10-19 23:28:13 +02:00
Hans-Christoph Steiner
49bd5a6462 use Babel to compile localizations and include in source tarball
python3-babel was also included in the gitlab-ci docker image:
ffc08dbc1d
2017-10-19 23:28:13 +02:00
Hans-Christoph Steiner
57c3c60f0e include in source tarball: be de es es_AR fr nb pt_BR tr uk zh_Hans zh_Hant
The way to officially include a new language in the source tarball is to
add it to the MANIFEST.in.  Otherwise, it will not be included in the
source tarball, and therefore won't be installed when using apt, pip, etc.
2017-10-19 23:16:58 +02:00
Hans-Christoph Steiner
927104a4e3 update: make strings translatable 2017-10-19 23:16:58 +02:00
Hans-Christoph Steiner
d4865ec038 include README.rst in official release source tarball
README.rst is still the standard for Python libs.
2017-10-19 23:16:58 +02:00
Hans-Christoph Steiner
7d4e354f25 FDroidException handle Exceptions that return things other than str
This is related to a4c4a16ed9
2017-10-19 20:38:43 +02:00
Hans-Christoph Steiner
af0d8ab84c tests: make pip3 install quieter for shorter CI logs 2017-10-19 20:23:57 +02:00
Hans-Christoph Steiner
c80d68dcc0 travis-ci: get OSX tests running again...
Java9 is starting to roll out on some of the Travis CI machines, but
the Android SDK does not yet work on Java9, it throws:

java.lang.NoClassDefFoundError: javax/xml/bind/annotation/XmlSchema
2017-10-19 20:23:57 +02:00
Hans-Christoph Steiner
3407c67041 Merge branch '391-fdroid-publish-unknown-execption' into 'master'
better error message in publish when repo_key is not set

Closes #391

See merge request fdroid/fdroidserver!352
2017-10-18 13:11:24 +00:00
Michael Pöhn
788c8f97fd better error message in publish when repo_key is not set 2017-10-17 22:10:39 +02:00
Hans-Christoph Steiner
e5acdee21e make update to update all translation files from source code 2017-10-17 21:13:08 +02:00
Hans-Christoph Steiner
85050ecb81 Merge branch 'weblate' into 'master'
Weblate

See merge request fdroid/fdroidserver!354
2017-10-17 16:24:26 +00:00
Hans-Christoph Steiner
f0988d45dd Weblate 2017-10-17 16:24:25 +00:00
Hans-Christoph Steiner
7c568cf16a jenkins-build-makebuildserver: use current version for test build 2017-10-17 16:24:21 +02:00
Torsten Grote
7832c0ef38 Merge branch '1.0-fixes' into 'master'
1.0 fixes

Closes #357

See merge request fdroid/fdroidserver!353
2017-10-17 14:19:47 +00:00
Hans-Christoph Steiner
6a8152af15 include all argparse strings in translation template
The Python argparse library has its own strings, which are translatable
via gettext.  This gets those sources strings from the library, and
includes them in this project.  Since gettext is invoked and configured
in fdroidserver, fdroidserver needs to handle the translations for the
libraries it uses.
2017-10-13 14:58:15 +02:00
Hans-Christoph Steiner
ccc3fb8b2e update translation template and add file context for each string
The file context lets the translators know which command the string applies
to.  It does not have line numbers, since those are less useful, while
causing lots of merge conflicts.
2017-10-13 14:58:15 +02:00
Hans-Christoph Steiner
460c4185bb update: support Fastlane's official location for screenshots
fastlane/android/metadata/locale/images/*Screenshots

https://github.com/fastlane/fastlane/blob/2.61.0/screengrab/lib/screengrab/runner.rb#L324

closes #357
2017-10-13 14:58:15 +02:00
Hans-Christoph Steiner
a4169484fd update: fix detection of Triple-T screenshots
* https://github.com/westnordost/StreetComplete/issues/489
* https://forum.f-droid.org/t/screenshots-dont-show-up-in-client-using-gradle-play-publisher/881/2

#357
2017-10-13 14:58:15 +02:00
Hans-Christoph Steiner
b6067e6a1f server: automatically create S3 bucket when using s3cmd 2017-10-13 14:58:15 +02:00
Hans-Christoph Steiner
0c4dc9779e server: move strings to be gettext translatable 2017-10-13 14:58:15 +02:00
Hans-Christoph Steiner
a4c4a16ed9 handle exceptions that send a tuple for the error message
Running `fdroid verify` I was seeing FDroidExceptions from verify.py:98
that had a tuple rather than a string.


Traceback (most recent call last):
  File "/home/hans/code/fdroid/server/fdroid", line 152, in <module>
    main()
  File "/home/hans/code/fdroid/server/fdroid", line 128, in main
    mod.main()
  File "/home/hans/code/fdroid/server/fdroidserver/verify.py", line 98, in main
    logging.info("...NOT verified - {0}".format(e))
  File "/home/hans/code/fdroid/server/fdroidserver/exception.py", line 22, in __str__
    ret += "\n==== detail begin ====\n%s\n==== detail end ====" % ''.join(self.detail).strip()
TypeError: sequence item 1: expected str instance, HTTPError found
2017-10-13 14:58:15 +02:00
Hans-Christoph Steiner
53ce81179c Merge branch 'error_on_jars' into 'master'
RFC: Error on jars

See merge request fdroid/fdroidserver!325
2017-10-12 11:46:59 +00:00
Hans-Christoph Steiner
d95e009c3f Merge branch 'gradle-4.2.1' into 'master'
makebuildserver: add Gradle 4.2.1

See merge request fdroid/fdroidserver!351
2017-10-08 19:06:09 +00:00
relan
dca96a6159 makebuildserver: add Gradle 4.2.1
N.B. Actual address of the distribution server is downloads.gradle.org;
services.gradle.org redirects to it.
2017-10-08 21:12:37 +03:00
Michael Pöhn
4b35f19480 Merge branch '334-make-index-generation-fully-reproducible' into 'master'
Resolve "make index generation fully reproducible"

Closes #334

See merge request fdroid/fdroidserver!343
2017-10-06 17:18:10 +00:00
Hans-Christoph Steiner
4f772596d2 Merge branch 'print-vcs-client-version' into 'master'
common: print VCS client version

See merge request fdroid/fdroidserver!349
2017-10-06 09:07:13 +00:00
relan
0ab0b03648 common: print VCS client version
This may help to debug issues with too old VCS clients.
2017-10-06 09:41:24 +03:00
Hans-Christoph Steiner
02449865f1 Merge branch 'fix_bare_except' into 'master'
fix bare except to satisfy newer pycodestyle

See merge request fdroid/fdroidserver!348
2017-10-04 20:13:46 +00:00
Hans-Christoph Steiner
a2c176e34a Merge branch 'build-tools-26-0-2' into 'master'
add build-tools 26.0.2

See merge request fdroid/fdroidserver!347
2017-10-04 20:13:33 +00:00
Marcus Hoffmann
50ba108093 fix bare except to satisfy newer pycodestyle 2017-10-04 19:23:53 +02:00
Marcus Hoffmann
f25cfe1b37 add build-tools 26.0.2 2017-10-04 19:03:41 +02:00
Marcus Hoffmann
1c5dccb413 import: fix bitbucket import
repo type can be found on main url, not under /src
2017-10-04 18:54:47 +02:00
Hans-Christoph Steiner
5567182629 Merge branch 'fix-dot-gradle-removal' into 'master'
build: fix build/ and .gradle/ removal after cleaning

Closes #384

See merge request fdroid/fdroidserver!346
2017-10-03 13:19:47 +00:00
Hans-Christoph Steiner
ad10bfcad2 Merge branch '291-include-apk-signatures-in-build-metadata-file' into 'master'
include APK signatures in build metadata file

Closes #291

See merge request fdroid/fdroidserver!287
2017-10-03 12:57:34 +00:00
relan
aad4bd89d8 build: fix build/ and .gradle/ removal after cleaning
An app may not have a top-level build.gradle file, while Gradle still
creates top-level .gradle/ directory. When build.gradle is absent,
fdroidserver will not remove .gradle/, scanner will find binaries in it
and fail the whole build.

Fix this by also checking for settings.gradle file (should always exist
in the top-level directory) in addition to build.gradle.
2017-10-01 10:11:37 +03:00