chiark / gitweb /
~ianmdlvl / fdroidserver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4a4bb3e f87b171)
Merge branch 'fdroid-version' into 'master'
authorDaniel Martí <mvdan@mvdan.cc>
Tue, 1 Sep 2015 18:27:55 +0000 (18:27 +0000)
committerDaniel Martí <mvdan@mvdan.cc>
Tue, 1 Sep 2015 18:27:55 +0000 (18:27 +0000)
commit6f05529dac5e2bcff4c3f2f856ca3f203d032073
treee05b79c31f9e7d0b9be9533c9f3accfa513d9f2etree | snapshot
parent4a4bb3e7a5e7f3208eb6d12dd5b00b9c3fcd05d1commit | diff
parentf87b17139b7838e99ca87c8a1e3c687f0a45c7d2commit | diff
Merge branch 'fdroid-version' into 'master'

fdroid --version and shared tests between gitlab and jenkins

This adds a `fdroid --version` flag for people to easily see the exact version of fdroidserver in use.  It'll also report the version using `git describe` when running from git.

The other moves the extended tests out of `./jenkins-build` into a common script for both gitlab-ci and jenkins.

See merge request !70
Unnamed repository; edit this file 'description' to name the repository.