mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-02 09:10:11 +02:00
Merge branch '2.0-deprecations' into 'master'
2.0 deprecations in `fdroid update` See merge request fdroid/fdroidserver!813
This commit is contained in:
commit
e63eb7cd2f
@ -37,6 +37,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
|
|||||||
### Removed
|
### Removed
|
||||||
* removed support for txt and json metadata
|
* removed support for txt and json metadata
|
||||||
([!772](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/772))
|
([!772](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/772))
|
||||||
|
* `make_current_version_link` is now off by default
|
||||||
|
|
||||||
## [1.1.4] - 2019-08-15
|
## [1.1.4] - 2019-08-15
|
||||||
### Fixed
|
### Fixed
|
||||||
|
@ -81,9 +81,9 @@ __complete_options() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
__complete_build() {
|
__complete_build() {
|
||||||
opts="-v -q -l -s -t -f -a -w"
|
opts="-v -q -l -s -t -f -a"
|
||||||
|
|
||||||
lopts="--verbose --quiet --latest --stop --test --server --reset-server --skip-scan --scan-binary --no-tarball --force --all --wiki --no-refresh"
|
lopts="--verbose --quiet --latest --stop --test --server --reset-server --skip-scan --scan-binary --no-tarball --force --all --no-refresh"
|
||||||
case "${prev}" in
|
case "${prev}" in
|
||||||
:)
|
:)
|
||||||
__vercode
|
__vercode
|
||||||
@ -125,9 +125,9 @@ __complete_install() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
__complete_update() {
|
__complete_update() {
|
||||||
opts="-c -v -q -b -i -I -e -w"
|
opts="-c -v -q -i -I -e"
|
||||||
lopts="--create-metadata --verbose --quiet --buildreport
|
lopts="--create-metadata --verbose --quiet
|
||||||
--icons --wiki --pretty --clean --delete-unknown
|
--icons --pretty --clean --delete-unknown
|
||||||
--nosign --rename-apks --use-date-from-apk"
|
--nosign --rename-apks --use-date-from-apk"
|
||||||
case "${prev}" in
|
case "${prev}" in
|
||||||
-e|--editor)
|
-e|--editor)
|
||||||
|
@ -124,7 +124,7 @@ default_config = {
|
|||||||
'sync_from_local_copy_dir': False,
|
'sync_from_local_copy_dir': False,
|
||||||
'allow_disabled_algorithms': False,
|
'allow_disabled_algorithms': False,
|
||||||
'per_app_repos': False,
|
'per_app_repos': False,
|
||||||
'make_current_version_link': True,
|
'make_current_version_link': False,
|
||||||
'current_version_name_source': 'Name',
|
'current_version_name_source': 'Name',
|
||||||
'deploy_process_logs': False,
|
'deploy_process_logs': False,
|
||||||
'update_stats': False,
|
'update_stats': False,
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import argparse
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
@ -2270,12 +2271,10 @@ def main():
|
|||||||
help=_("Add skeleton metadata files for APKs that are missing them"))
|
help=_("Add skeleton metadata files for APKs that are missing them"))
|
||||||
parser.add_argument("--delete-unknown", action="store_true", default=False,
|
parser.add_argument("--delete-unknown", action="store_true", default=False,
|
||||||
help=_("Delete APKs and/or OBBs without metadata from the repo"))
|
help=_("Delete APKs and/or OBBs without metadata from the repo"))
|
||||||
parser.add_argument("-b", "--buildreport", action="store_true", default=False,
|
|
||||||
help=_("Report on build data status"))
|
|
||||||
parser.add_argument("-I", "--icons", action="store_true", default=False,
|
parser.add_argument("-I", "--icons", action="store_true", default=False,
|
||||||
help=_("Resize all the icons exceeding the max pixel size and exit"))
|
help=_("Resize all the icons exceeding the max pixel size and exit"))
|
||||||
parser.add_argument("-w", "--wiki", default=False, action="store_true",
|
parser.add_argument("-w", "--wiki", default=False, action="store_true",
|
||||||
help=_("Update the wiki"))
|
help=argparse.SUPPRESS)
|
||||||
parser.add_argument("--pretty", action="store_true", default=False,
|
parser.add_argument("--pretty", action="store_true", default=False,
|
||||||
help=_("Produce human-readable XML/JSON for index files"))
|
help=_("Produce human-readable XML/JSON for index files"))
|
||||||
parser.add_argument("--clean", action="store_true", default=False,
|
parser.add_argument("--clean", action="store_true", default=False,
|
||||||
@ -2445,6 +2444,7 @@ def main():
|
|||||||
|
|
||||||
# Update the wiki...
|
# Update the wiki...
|
||||||
if options.wiki:
|
if options.wiki:
|
||||||
|
logging.warning(_('wiki support is deprecated and will be removed in the next release!'))
|
||||||
update_wiki(apps, apks + archapks)
|
update_wiki(apps, apks + archapks)
|
||||||
status_update_json(apps, apks + archapks)
|
status_update_json(apps, apks + archapks)
|
||||||
|
|
||||||
|
@ -165,6 +165,7 @@ if which zipalign || ls -1 $ANDROID_HOME/build-tools/*/zipalign; then
|
|||||||
cd $REPOROOT
|
cd $REPOROOT
|
||||||
cp $WORKSPACE/tests/keystore.jks $REPOROOT/
|
cp $WORKSPACE/tests/keystore.jks $REPOROOT/
|
||||||
$fdroid init --keystore keystore.jks --repo-keyalias=sova
|
$fdroid init --keystore keystore.jks --repo-keyalias=sova
|
||||||
|
echo 'make_current_version_link = True' >> config.py
|
||||||
echo 'keystorepass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py
|
echo 'keystorepass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py
|
||||||
echo 'keypass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py
|
echo 'keypass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py
|
||||||
echo 'keydname = "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"' >> config.py
|
echo 'keydname = "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"' >> config.py
|
||||||
|
Loading…
Reference in New Issue
Block a user