From 802c892884062169d132e39263ba37f2f12d4f5e Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 2 Feb 2021 13:11:20 +0000 Subject: [PATCH] ci: Add fdroid nightlies upload task --- .gitlab-ci.yml | 22 ++++++++++++++++++++++ docs/de/fdroid.md | 33 +++++++++++++++++++++++++++++++-- docs/en/fdroid.md | 29 +++++++++++++++++++++++++++++ docs/es/fdroid.md | 29 +++++++++++++++++++++++++++++ docs/nl/fdroid.md | 29 +++++++++++++++++++++++++++++ docs/ru/fdroid.md | 29 +++++++++++++++++++++++++++++ docs/tr/fdroid.md | 29 +++++++++++++++++++++++++++++ 7 files changed, 198 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b7ac33a..3f7b7dbb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,6 +114,28 @@ upload-fdroid: only: - tags +upload-fdroid-nightly: + stage: release + before_script: + - 'which ssh-agent || (sudo apt-get update -y && sudo apt-get install openssh-client -y )' + - 'which rsync || (sudo apt-get update -y && sudo apt-get install rsync -y )' + - 'which pcregrep || (sudo apt-get update -y && sudo apt-get install pcregrep -y )' + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - ssh-keyscan -t rsa fdroid.nordgedanken.dev >> ~/.ssh/known_hosts + script: + - cd build/android/ + - export UPDATE_VERSION=$(pcregrep -o1 'version:\s([0-9]*\.[0-9]*\.[0-9]*)\+[0-9]*' ../../pubspec.yaml) && mv app-release.apk "${UPDATE_VERSION}_$(date +%s).apk" + - rsync -rav -e ssh ./ fluffy@fdroid.nordgedanken.dev:/opt/fdroid/fluffychat-nightly/repo + - ssh fluffy@fdroid.nordgedanken.dev -t '/bin/bash -i -l -c "cd /opt/fdroid/fluffychat-nightly && fdroid update --verbose"' + needs: ["build_android_apk"] + resource_group: playstore_release + allow_failure: true + only: + - main + pages: stage: deploy image: ruby:latest diff --git a/docs/de/fdroid.md b/docs/de/fdroid.md index 41c41f39..207ab3ce 100644 --- a/docs/de/fdroid.md +++ b/docs/de/fdroid.md @@ -3,7 +3,7 @@ layout: default title: F-Droid Paketquelle lang: de --- -# F-Droid Repository +# F-Droid Paketquelle ## Paketquelle zu F-Droid hinzufügen @@ -28,6 +28,35 @@ Falls es weitherhin nicht funktioniert folge den nächsten Schritten: 4. Drücke auf das Plus Symbol in der oberen Leiste 5. Trag in das erste Feld `https://fdroid.fluffychat.im` und in das zweite Feld `8E2637AEF6697CC6DD486AF044A6EE45B1A742AE3EF56566E748CDE8BC65C1FB` ein -## Wie lautet der Fingerabdruck? +## Wie lautet der Fingerabdruck der stabilen Paketquelle? Der Fingerabdruck dieser Paketquelle ist: `8E2637AEF6697CC6DD486AF044A6EE45B1A742AE3EF56566E748CDE8BC65C1FB` + +# Nightly Paketquelle + +## Paketquelle zu F-Droid hinzufügen + +Alternativ kann man auch eine nightly Version genutzt werden. Diese kann instabil sein und ist aktualisiert bei jeder Änderung in der Gitlab Repository. + +{::nomarkdown} + + + +{:/} + + +### Wenn der QR-Code nicht funktioniert: + +Zuerst prüf ob du die F-Droid App installiert hast. Sollte dies nicht der Fall sein kannst du die App auf [https://f-droid.org/](https://f-droid.org/) runterladen. +Nachdem du sichergegangen bist, dass die App installiert ist und F-Droid nicht zuvor installiert war prüf ob der QR-Code nun funktioniert. +Falls es weitherhin nicht funktioniert folge den nächsten Schritten: + +1. Öffne die F-Droid App +2. Gehe zum `Optionen` Tab in der unteren Leiste +3. Klicke auf `Paketquellen` +4. Drücke auf das Plus Symbol in der oberen Leiste +5. Trag in das erste Feld `https://nightly.fdroid.fluffychat.im` und in das zweite Feld `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D` ein + +## Wie lautet der Fingerabdruck der stabilen Paketquelle? + +Der Fingerabdruck dieser Paketquelle ist: `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D` diff --git a/docs/en/fdroid.md b/docs/en/fdroid.md index 7a1a7adb..1b504c66 100644 --- a/docs/en/fdroid.md +++ b/docs/en/fdroid.md @@ -31,3 +31,32 @@ If this still isn't working follow the next steps: ## What is the fingerprint? The fingerprint of the Repository is: `8E2637AEF6697CC6DD486AF044A6EE45B1A742AE3EF56566E748CDE8BC65C1FB` + +# Nightly Repository + +## Add Repository to F-Droid + +Easiest way to add the Repository is to either scan the QR-Code or if you are on your phone directly click it. + +{::nomarkdown} + + + +{:/} + + +### If the QR-Code doesn't work: + +First check if you have f-droid installed. If not you can get it from: [https://f-droid.org/](https://f-droid.org/). +After you made sure you installed it and you didn't have it installed before you can try again the QR-Code. +If this still isn't working follow the next steps: + +1. Open the f-droid App +2. Go to the `Settings` Tab in the Bottom bar +3. Click the `Repositories` Action +4. Click on the plus sign at the top. +5. Fill in `https://nightly.fdroid.fluffychat.im` into the top field and `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D` in the bottom field. + +## What is the fingerprint? + +The fingerprint of the Repository is: `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D` diff --git a/docs/es/fdroid.md b/docs/es/fdroid.md index 7a1a7adb..1b504c66 100644 --- a/docs/es/fdroid.md +++ b/docs/es/fdroid.md @@ -31,3 +31,32 @@ If this still isn't working follow the next steps: ## What is the fingerprint? The fingerprint of the Repository is: `8E2637AEF6697CC6DD486AF044A6EE45B1A742AE3EF56566E748CDE8BC65C1FB` + +# Nightly Repository + +## Add Repository to F-Droid + +Easiest way to add the Repository is to either scan the QR-Code or if you are on your phone directly click it. + +{::nomarkdown} + + + +{:/} + + +### If the QR-Code doesn't work: + +First check if you have f-droid installed. If not you can get it from: [https://f-droid.org/](https://f-droid.org/). +After you made sure you installed it and you didn't have it installed before you can try again the QR-Code. +If this still isn't working follow the next steps: + +1. Open the f-droid App +2. Go to the `Settings` Tab in the Bottom bar +3. Click the `Repositories` Action +4. Click on the plus sign at the top. +5. Fill in `https://nightly.fdroid.fluffychat.im` into the top field and `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D` in the bottom field. + +## What is the fingerprint? + +The fingerprint of the Repository is: `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D` diff --git a/docs/nl/fdroid.md b/docs/nl/fdroid.md index 7a1a7adb..1b504c66 100644 --- a/docs/nl/fdroid.md +++ b/docs/nl/fdroid.md @@ -31,3 +31,32 @@ If this still isn't working follow the next steps: ## What is the fingerprint? The fingerprint of the Repository is: `8E2637AEF6697CC6DD486AF044A6EE45B1A742AE3EF56566E748CDE8BC65C1FB` + +# Nightly Repository + +## Add Repository to F-Droid + +Easiest way to add the Repository is to either scan the QR-Code or if you are on your phone directly click it. + +{::nomarkdown} + + + +{:/} + + +### If the QR-Code doesn't work: + +First check if you have f-droid installed. If not you can get it from: [https://f-droid.org/](https://f-droid.org/). +After you made sure you installed it and you didn't have it installed before you can try again the QR-Code. +If this still isn't working follow the next steps: + +1. Open the f-droid App +2. Go to the `Settings` Tab in the Bottom bar +3. Click the `Repositories` Action +4. Click on the plus sign at the top. +5. Fill in `https://nightly.fdroid.fluffychat.im` into the top field and `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D` in the bottom field. + +## What is the fingerprint? + +The fingerprint of the Repository is: `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D` diff --git a/docs/ru/fdroid.md b/docs/ru/fdroid.md index 7a1a7adb..1b504c66 100644 --- a/docs/ru/fdroid.md +++ b/docs/ru/fdroid.md @@ -31,3 +31,32 @@ If this still isn't working follow the next steps: ## What is the fingerprint? The fingerprint of the Repository is: `8E2637AEF6697CC6DD486AF044A6EE45B1A742AE3EF56566E748CDE8BC65C1FB` + +# Nightly Repository + +## Add Repository to F-Droid + +Easiest way to add the Repository is to either scan the QR-Code or if you are on your phone directly click it. + +{::nomarkdown} + + + +{:/} + + +### If the QR-Code doesn't work: + +First check if you have f-droid installed. If not you can get it from: [https://f-droid.org/](https://f-droid.org/). +After you made sure you installed it and you didn't have it installed before you can try again the QR-Code. +If this still isn't working follow the next steps: + +1. Open the f-droid App +2. Go to the `Settings` Tab in the Bottom bar +3. Click the `Repositories` Action +4. Click on the plus sign at the top. +5. Fill in `https://nightly.fdroid.fluffychat.im` into the top field and `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D` in the bottom field. + +## What is the fingerprint? + +The fingerprint of the Repository is: `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D` diff --git a/docs/tr/fdroid.md b/docs/tr/fdroid.md index 1ef9bf8a..19afda9c 100644 --- a/docs/tr/fdroid.md +++ b/docs/tr/fdroid.md @@ -31,3 +31,32 @@ Hâlâ çalışmıyorsa, aşağıdaki adımları izleyin: ## Parmak izi ne? Deponun parmak izi: `8E2637AEF6697CC6DD486AF044A6EE45B1A742AE3EF56566E748CDE8BC65C1FB` + +# Nightly Deposu + +## Depoyu F-Droid'e Ekleyin + +Depoyu eklemenin en kolay yolu, QR kodunu taramak veya telefonunuzdaysanız doğrudan ona tıklamaktır. + +{::nomarkdown} + + + +{:/} + + +### QR kodu çalışmazsa: + +Önce F-Droid'in kurulu olup olmadığına bakın. Eğer değilse şuradan edinebilirsiniz: [https://f-droid.org/](https://f-droid.org/). +Daha önce olmadığından ve artık kurduğunuzdan emin olduktan sonra QR kodunu tekrar deneyebilirsiniz. +Hâlâ çalışmıyorsa, aşağıdaki adımları izleyin: + +1. F-Droid uygulamasını açın. +2. Alt çubuktaki `Ayarlar` sekmesine gidin. +3. `Depolar` bölümüne tıklayın. +4. Üstteki artı işaretine tıklayın. +5. Üstteki alana `https://nightly.fdroid.nordgedanken.dev` ve alttaki alana `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D` yazın. + +## Parmak izi ne? + +Deponun parmak izi: `21A469657300576478B623DF99D8EB889A80BCD939ACA60A4074741BEAEC397D`