kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-05 18:50:09 +02:00
Code Activity

Merge branch 'publish_unsigned' into 'master'

Browse Source 
Publish unsigned builds

See merge request fdroid/fdroidserver!864
This commit is contained in:
Hans-Christoph Steiner 2021-02-12 10:40:18 +00:00
commit cb5ebfc8f0
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/deploy.py
View File

@ -783,6 +783,10 @@ def main():
if config['per_app_repos']:
repo_sections += common.get_per_app_repos()
if os.path.isdir('unsigned') or (local_copy_dir is not None
and os.path.isdir(os.path.join(local_copy_dir, 'unsigned'))):
repo_sections.append('unsigned')
for repo_section in repo_sections:
if local_copy_dir is not None:
if config['sync_from_local_copy_dir']:

10
tests/run-tests
View File

@ -1181,7 +1181,7 @@ if have_git_2_3; then
LOCAL_COPY_DIR=`create_test_dir`/fdroid
mkdir $LOCAL_COPY_DIR
ONLINE_ROOT=`create_test_dir`
SERVERWEBROOT=`create_test_dir`
SERVERWEBROOT=`create_test_dir`/fdroid
# create offline binary transparency log
cd $OFFLINE_ROOT
@ -1202,6 +1202,8 @@ if have_git_2_3; then
fdroid_init_with_prebuilt_keystore
printf '\narchive_older: 3\n' >> config.yml
cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $WORKSPACE/tests/stats $OFFLINE_ROOT/
mkdir $OFFLINE_ROOT/unsigned
cp $WORKSPACE/tests/urzip-release-unsigned.apk $OFFLINE_ROOT/unsigned
echo "mirrors: ['http://foo.bar/fdroid', 'http://asdflkdsfjafdsdfhkjh.onion/fdroid']" >> config.yml
echo "servergitmirrors: $SERVER_GIT_MIRROR" >> config.yml
@ -1216,15 +1218,17 @@ if have_git_2_3; then
[ `git rev-list --count HEAD` == "1" ]
cd ..
$fdroid deploy --verbose
test -e $LOCAL_COPY_DIR/unsigned/urzip-release-unsigned.apk
grep -F '<application id=' $LOCAL_COPY_DIR/repo/index.xml > /dev/null
cd $ONLINE_ROOT
echo "local_copy_dir: $LOCAL_COPY_DIR" >> config.yml
echo "sync_from_local_copy_dir: True" >> config.yml
echo "serverwebroots: $SERVERWEBROOT" >> config.yml
echo "serverwebroot: $SERVERWEBROOT" >> config.yml
echo "servergitmirrors: $SERVER_GIT_MIRROR" >> config.yml
echo "local_copy_dir: $LOCAL_COPY_DIR" >> config.yml
echo "binary_transparency_remote: $BINARY_TRANSPARENCY_REMOTE" >> config.yml
$fdroid deploy --verbose
test -e $ONLINE_ROOT/unsigned/urzip-release-unsigned.apk
test -e $SERVERWEBROOT/unsigned/urzip-release-unsigned.apk
cd $BINARY_TRANSPARENCY_REMOTE
[ `git rev-list --count HEAD` == "1" ]
cd $SERVER_GIT_MIRROR