From 0983a6a0b05ad58876d554b186fa2b85117d6bec Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 4 Jan 2018 23:00:55 +0100 Subject: [PATCH] gitlab-ci: nightly builds using `fdroid nightly` --- .gitignore | 2 + .gitlab-ci.yml | 4 +- config/nightly-repo/config.py | 18 ---- config/nightly-repo/deploy | 82 ------------------ config/nightly-repo/fdroid-icon.png | Bin 3367 -> 0 bytes .../metadata/org.fdroid.fdroid.yml | 15 ---- 6 files changed, 5 insertions(+), 116 deletions(-) delete mode 100644 config/nightly-repo/config.py delete mode 100755 config/nightly-repo/deploy delete mode 100644 config/nightly-repo/fdroid-icon.png delete mode 100644 config/nightly-repo/metadata/org.fdroid.fdroid.yml diff --git a/.gitignore b/.gitignore index aef3c14ae..1b11e4dc3 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ junit-report.xml # Screen dumps from Android Studio/DDMS captures/ + +/fdroid/ \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5dae6e6e4..0611e4e40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,7 +89,9 @@ deploy_nightly: only: - master script: - - "[ -z \"$DEBUG_KEYSTORE\" ] || ./config/nightly-repo/deploy" + - ./gradlew assembleDebug + - apt update; apt install -y --no-install-recommends fdroidserver python3-qrcode openssh-client + - fdroid nightly -v after_script: # this file changes every time but should not be cached diff --git a/config/nightly-repo/config.py b/config/nightly-repo/config.py deleted file mode 100644 index 65eaeed10..000000000 --- a/config/nightly-repo/config.py +++ /dev/null @@ -1,18 +0,0 @@ - -repo_icon = "fdroid-icon.png" -repo_description = """ -This repo is nightly builds, it should only be used for testing! -""" - -archive_older = 10 -archive_icon = "fdroid-icon.png" -archive_description = """ -The repository of older versions of applications from the main repository. -""" - -make_current_version_link = False -accepted_formats = ('txt', 'yml') -repo_keyalias = "androiddebugkey" -keystorepass = "android" -keypass = "android" -keydname = "CN=Android Debug,O=Android,C=US" diff --git a/config/nightly-repo/deploy b/config/nightly-repo/deploy deleted file mode 100755 index 71778fb37..000000000 --- a/config/nightly-repo/deploy +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash - -set -e -set -x - -echo "deb http://deb.debian.org/debian stretch-backports main" \ - > /etc/apt/sources.list.d/stretch-backports.list -apt-get update -apt-get install -y --no-install-recommends -t stretch-backports \ - fdroidserver openssh-client rsync python3-qrcode - -repo_git_base=${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}-nightly -repo_base=https://gitlab.com/${repo_git_base} -repo_url=${repo_base}/raw/master/fdroid/repo -archive_url=${repo_base}/raw/master/fdroid/archive -mkdir -p $HOME/.android -keystore=$HOME/.android/debug.keystore -echo "repo_name = '$repo_git_base'" >> config/nightly-repo/config.py -echo "repo_url = '$repo_url'" >> config/nightly-repo/config.py -echo "archive_name = '$repo_git_base archive'" >> config/nightly-repo/config.py -echo "archive_url = '$archive_url'" >> config/nightly-repo/config.py -echo "servergitmirrors = 'git@gitlab.com:$repo_git_base'" >> config/nightly-repo/config.py -echo "keystore = '$keystore'" >> config/nightly-repo/config.py -chmod 0600 config/nightly-repo/config.py - -sed -i -e '/<\/string-array>/d' -e '/<\/resources>/d' \ - app/src/main/res/values/default_repos.xml -echo "$repo_git_base" >> app/src/main/res/values/default_repos.xml -echo "$repo_url" >> app/src/main/res/values/default_repos.xml -cat config/nightly-repo/repo.xml >> app/src/main/res/values/default_repos.xml -echo "" >> app/src/main/res/values/default_repos.xml - -set +x # do not show contents of secret variables! -echo $DEBUG_KEYSTORE | base64 --decode --ignore-garbage > $keystore -set -x - -./gradlew assembleDebug -PdisablePreDex - -mkdir config/nightly-repo/repo/ -mv app/build/outputs/apk/app-debug.apk config/nightly-repo/repo/ -cd config/nightly-repo - -pw=android -alias=androiddebugkey -keytool -v -importkeystore \ - -srckeystore $keystore -srcalias $alias -srcstorepass $pw -srckeypass $pw \ - -destkeystore keystore.p12 -destalias $alias -deststorepass $pw -destkeypass $pw -deststoretype PKCS12 - -ssh_private_key=$HOME/.ssh/id_rsa -mkdir -p $(dirname $ssh_private_key) -openssl pkcs12 -in keystore.p12 -out key.pem -passin pass:$pw -passout pass:$pw -openssl rsa -in key.pem -out ${ssh_private_key} -passin pass:$pw -chmod 600 ${ssh_private_key} -ssh-keygen -y -f ${ssh_private_key} > ${ssh_private_key}.pub -echo "SSH public deploy key:" -cat ${ssh_private_key}.pub -eval $(ssh-agent -s) -ssh-add ${ssh_private_key} - -if git clone $repo_base git-mirror; then - cd git-mirror - git remote rm origin - qr $repo_url > qr.png - echo "# $repo_git_base" > README.md - echo "[![$repo_url](qr.png)]($repo_url)" >> README.md - printf "\n\nLast updated: " >> README.md - date >> README.md - git add README.md - git config user.email "$CI_PROJECT_NAMESPACE@$CI_PROJECT_NAME" - git config user.name "$CI_PROJECT_NAMESPACE $CI_PROJECT_NAME" - git commit README.md -m README - cd .. -fi -if [ -d git-mirror/fdroid/repo ]; then - rsync -axv git-mirror/fdroid/repo/ repo/ -fi - -fdroid update --rename-apks - -ssh-add -l -echo -e "Host *\n\tStrictHostKeyChecking no\n\n" >> ~/.ssh/config -fdroid server update --verbose diff --git a/config/nightly-repo/fdroid-icon.png b/config/nightly-repo/fdroid-icon.png deleted file mode 100644 index 0c0d41738f054eaa77bba0ef0785e87227aa2692..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3367 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 diff --git a/config/nightly-repo/metadata/org.fdroid.fdroid.yml b/config/nightly-repo/metadata/org.fdroid.fdroid.yml deleted file mode 100644 index 3b037784e..000000000 --- a/config/nightly-repo/metadata/org.fdroid.fdroid.yml +++ /dev/null @@ -1,15 +0,0 @@ -Categories: System -License: GPL-3.0+ -WebSite: https://f-droid.org -SourceCode: https://gitlab.com/fdroid/fdroidclient -IssueTracker: https://gitlab.com/fdroid/fdroidclient/issues -Changelog: https://gitlab.com/fdroid/fdroidclient/raw/HEAD/CHANGELOG.md -Donate: https://f-droid.org/about -FlattrID: 343053 -Bitcoin: 15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18 - -AutoName: F-Droid Nightly -Summary: Nightly test build of F-Droid - -RepoType: srclib -Repo: fdroidclient