Merge branch 'develop' into 'master'

Release

See merge request sschueller/peertube!17
This commit is contained in:
Stefan Schüller 2021-01-31 23:35:16 +01:00
commit 12d85f5814
21 changed files with 218 additions and 40 deletions

View File

@ -1,12 +1,13 @@
stages: stages:
- environment - environment
- fetch-version
- build - build
- test - test
- release
- internal - internal
- alpha - alpha
- beta - beta
- production - production
- stop
.updateContainerJob: .updateContainerJob:
image: docker:stable image: docker:stable
@ -46,17 +47,59 @@ ensureContainer:
- pwd - pwd
- echo "$signing_jks_file_hex" | xxd -r -p - > android-signing-keystore.jks - echo "$signing_jks_file_hex" | xxd -r -p - > android-signing-keystore.jks
- md5sum android-signing-keystore.jks - md5sum android-signing-keystore.jks
# get next version from latest changelog
- "export VERSION_CODE=`ls -f ./fastlane/metadata/android/en-US/changelogs | cut -d_ -f3 | sort -n | tail -1 | rev | cut -c5- | rev` && echo $VERSION_CODE"
# We add 200 to get this high enough above current versionCodes that are published
# - "export VERSION_CODE=$((200 + $CI_PIPELINE_IID)) && echo $VERSION_CODE"
- "export VERSION_SHA=`echo ${CI_COMMIT_SHA:0:8}` && echo $VERSION_SHA"
- "export VERSION_NAME=${VERSION_CODE:0:1}.${VERSION_CODE:1:1}.${VERSION_CODE:2} && echo $VERSION_NAME"
after_script: after_script:
- rm -f android-signing-keystore.jks || true - rm -f android-signing-keystore.jks || true
artifacts: artifacts:
paths: paths:
- app/build/outputs - app/build/outputs
- app/build.gradle
tags:
- docker
# https://levelup.gitconnected.com/semantic-versioning-and-release-automation-on-gitlab-9ba16af0c21
fetch-semantic-version:
image: node:13
stage: fetch-version
only:
refs:
- master
- alpha
- /^(([0-9]+)\.)?([0-9]+)\.x/ # This matches maintenance branches
- /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ # This matches pre-releases
script:
- npm install @semantic-release/gitlab @semantic-release/exec @semantic-release/changelog @semantic-release/git -D
- npx semantic-release --generate-notes false --dry-run
- export VERSION_CODE=`grep -oP "versionCode[\s]*(\d)+" app/build.gradle | awk '{ print $2 }'`
- export VERSION_CODE=$((${VERSION_CODE}+1)) && echo ${VERSION_CODE}
- export VERSION_SHA=`echo ${CI_COMMIT_SHA:0:8}` && echo ${VERSION_SHA}
- export VERSION=`cat VERSION.txt` && echo ${VERSION}
- export VERSION_NAME=${VERSION}-${VERSION_SHA} && echo ${VERSION_NAME}
- sed -i -e "s/versionCode .*/versionCode ${VERSION_CODE}/g" app/build.gradle
- sed -i -e "s/versionName .*/versionName \"${VERSION_NAME}\"/g" app/build.gradle
- echo ${VERSION_CODE} > VERSION_CODE.txt
- echo ${VERSION_NAME} > VERSION_NAME.txt
artifacts:
paths:
- VERSION.txt
- VERSION_CODE.txt
- VERSION_NAME.txt
- app/build.gradle
tags:
- docker
generate-non-semantic-version:
stage: fetch-version
except:
refs:
- master
- alpha
- /^(([0-9]+)\.)?([0-9]+)\.x/ # This matches maintenance branches
- /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ # This matches pre-releases
script:
- echo build-$CI_PIPELINE_ID > VERSION.txt
artifacts:
paths:
- VERSION.txt
tags: tags:
- docker - docker
@ -65,6 +108,16 @@ buildDebug:
script: script:
- bundle exec fastlane buildDebug - bundle exec fastlane buildDebug
testDebug:
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
stage: test
dependencies:
- buildDebug
script:
- bundle exec fastlane test
tags:
- docker
buildRelease: buildRelease:
extends: .build_job extends: .build_job
script: script:
@ -76,31 +129,25 @@ buildRelease:
except: except:
- branches - branches
testDebug: release:
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG image: node:13
stage: test stage: release
dependencies:
- buildDebug
script:
- bundle exec fastlane test
tags:
- docker
publishGithub:
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
stage: internal
dependencies:
- buildRelease
when: manual
script:
- "export VERSION_CODE=`ls -f ./fastlane/metadata/android/en-US/changelogs | cut -d_ -f3 | sort -n | tail -1 | rev | cut -c5- | rev` && echo $VERSION_CODE"
- "export VERSION_SHA=`echo ${CI_COMMIT_SHA:0:8}` && echo $VERSION_SHA"
- "export VERSION_NAME=${VERSION_CODE:0:1}.${VERSION_CODE:1:1}.${VERSION_CODE:2} && echo $VERSION_NAME"
- ci-scripts/make-github-release.sh
tags:
- docker
only: only:
- /^v[0-9]*\.[0-9]*\.[0-9]*$/i refs:
- master
- alpha
# This matches maintenance branches
- /^(([0-9]+)\.)?([0-9]+)\.x/
# This matches pre-releases
- /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/
script:
- npm install @semantic-release/gitlab @semantic-release/exec @semantic-release/changelog @semantic-release/git -D
- npx semantic-release
artifacts:
paths:
- CHANGELOG.md
tags:
- docker
publishInternal: publishInternal:
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
@ -120,6 +167,21 @@ publishInternal:
only: only:
- /^v[0-9]*\.[0-9]*\.[0-9]*$/i - /^v[0-9]*\.[0-9]*\.[0-9]*$/i
publishGithub:
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
stage: internal
dependencies:
- buildRelease
when: manual
script:
- export VERSION_CODE=`cat VERSION_CODE.txt`
- export VERSION_NAME=`cat VERSION_NAME.txt`
- ci-scripts/make-github-release.sh
tags:
- docker
only:
- /^v[0-9]*\.[0-9]*\.[0-9]*$/i
.promote_job: .promote_job:
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
when: manual when: manual

25
.releaserc.yml Normal file
View File

@ -0,0 +1,25 @@
---
plugins:
- "@semantic-release/commit-analyzer"
- - "@semantic-release/release-notes-generator"
- linkReferences: false
linkCompare: false
- - "@semantic-release/exec"
- verifyReleaseCmd: "echo ${nextRelease.version} > VERSION.txt"
generateNotesCmd: "if [[ ! -f RELEASE_NOTES.txt ]]; then echo '${nextRelease.notes.trim()}' > RELEASE_NOTES.txt; fi && echo '${nextRelease.notes.trim()}' > fastlane/metadata/android/en-US/changelogs/$(cat VERSION_CODE.txt).txt"
- - "@semantic-release/changelog"
- changelogFile: CHANGELOG.md
- - "@semantic-release/git"
- assets:
- 'app/build.gradle'
- 'CHANGELOG.md'
- 'VERSION.txt'
- "fastlane/metadata/android/en-US/changelogs/*.txt"
message: "chore(release): ${nextRelease.version} [only cd]\n\n${nextRelease.notes}"
- "@semantic-release/gitlab"
branches:
- "master"
- "+([0-9])?(.{+([0-9]),x}).x"
- name: "alpha"
prerelease: "alpha"

View File

@ -69,6 +69,8 @@ Reproducible builds currently does not work.
## Contribution ## Contribution
Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome. Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome.
For your commits please follow: https://www.conventionalcommits.org
## Donate ## Donate
<noscript><a href="https://liberapay.com/sschueller/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a></noscript> <noscript><a href="https://liberapay.com/sschueller/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a></noscript>

1
VERSION.txt Normal file
View File

@ -0,0 +1 @@
1.0.55

View File

@ -44,8 +44,8 @@ android {
applicationId "net.schueller.peertube" applicationId "net.schueller.peertube"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode Integer.valueOf(System.getenv("VERSION_CODE") ?: 1) versionCode 1055
versionName System.getenv("VERSION_NAME") + "-" + System.getenv("VERSION_SHA") versionName "1.0.55-73487634"
buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L' buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

View File

@ -347,4 +347,12 @@
<string name="server_book_no_servers_found">Das Serververzeichnis ist leer</string> <string name="server_book_no_servers_found">Das Serververzeichnis ist leer</string>
<string name="hello_blank_fragment">Hallo leeres Fragment</string> <string name="hello_blank_fragment">Hallo leeres Fragment</string>
<string name="server_selection_filter_hint">Liste filtern</string> <string name="server_selection_filter_hint">Liste filtern</string>
<string name="pref_insecure_confirm_message">Sie sind dabei, die gesamte SSL-Zertifizierungsprüfung in Thorium zu deaktivieren. Die Deaktivierung kann sehr gefährlich sein, wenn der Peertube-Server nicht unter Ihrer Kontrolle steht, da ein Man-in-the-Middle-Angriff den Datenverkehr ohne Ihr Wissen auf einen anderen Server leiten könnte. Ein Angreifer könnte Passwörter und andere persönliche Daten aufzeichnen.</string>
<string name="pref_insecure_confirm_yes">Ja</string>
<string name="pref_insecure_confirm_no">Nein</string>
<string name="pref_insecure_confirm_title">Warnung!</string>
<string name="settings_activity_advanced_category_title">Erweitert</string>
<string name="server_book_add_save_button">Speichern</string>
<string name="pref_title_accept_insecure">SSL-Zertifikatsprüfung deaktivieren</string>
<string name="pref_description_accept_insecure">Unsichere Verbindungen ignorieren. Verwenden Sie dies nur, wenn Sie den Server kennen, mit dem Sie sich verbinden. Erfordert einen Neustart der App.</string>
</resources> </resources>

View File

@ -40,7 +40,7 @@
<string name="lightgreen">Vaaleanvihreä</string> <string name="lightgreen">Vaaleanvihreä</string>
<string name="lu">luba (Katanga)</string> <string name="lu">luba (Katanga)</string>
<string name="error_invalid_password">Tämä salasana on liian lyhyt</string> <string name="error_invalid_password">Tämä salasana on liian lyhyt</string>
<string name="bottom_nav_title_discover">Yleiskatsaus</string> <string name="bottom_nav_title_discover">Etusivu</string>
<string name="id">indonesia</string> <string name="id">indonesia</string>
<string name="ga">iiri</string> <string name="ga">iiri</string>
<string name="bottom_nav_title_subscriptions">Tilaukset</string> <string name="bottom_nav_title_subscriptions">Tilaukset</string>
@ -57,7 +57,7 @@
<string name="am">amhara</string> <string name="am">amhara</string>
<string name="pa">pandžabi</string> <string name="pa">pandžabi</string>
<string name="server_selection_set_server">Palvelin asetettu: %s</string> <string name="server_selection_set_server">Palvelin asetettu: %s</string>
<string name="pref_title_dark_mode">Pimeä tila</string> <string name="pref_title_dark_mode">Tumma tila</string>
<string name="av">avaari</string> <string name="av">avaari</string>
<string name="te">telugu</string> <string name="te">telugu</string>
<string name="video_meta_button_share">Jaa</string> <string name="video_meta_button_share">Jaa</string>
@ -302,4 +302,57 @@
<string name="video_speed_075">0,75×</string> <string name="video_speed_075">0,75×</string>
<string name="pref_description_language_app">Valitse kieli sovelluksen käyttöliittymälle. Käynnistä sovellus uudelleen, jotta muutos tulee voimaan.</string> <string name="pref_description_language_app">Valitse kieli sovelluksen käyttöliittymälle. Käynnistä sovellus uudelleen, jotta muutos tulee voimaan.</string>
<string name="pref_language_app">Sovelluksen kieli</string> <string name="pref_language_app">Sovelluksen kieli</string>
<string name="pref_title_buildtime">Kokoamisnumero</string>
<string name="title_activity_settings2">AsetuksetToiminta2(SettingsActivity2)</string>
<string name="pref_description_accept_insecure">Ohita epävarmat yhteydet. Käytä tätä, jos tiedät palvelimen, johon olet yhdistämässä. Vaatii sovelluksen uudelleen käynnistämisen.</string>
<string name="pref_insecure_confirm_message">Olet poistamassa käytöstä SSL-varmenteiden tarkituksen Thromiumissa. Tämän poistaminen käytöstä voi olla erittäin vaarallista, jos peertube-palvelin ei ole sinun hallinassasi, koska välistävetohyökkäys voi ohjata liikenteen toiseen palvelimeen tietämättäsi. Hyökkääjä voi tallentaa salasanojasi ja muita henkilötietojasi.</string>
<string name="authentication_token_refresh_success">Tunnus päivitetty</string>
<string name="authentication_token_refresh_failed">Tunnuksen päivittäminen epäonnistui</string>
<string name="server_book_valid_url_is_required">Kelvollinen URL-osoite vaaditaan</string>
<string name="server_book_label_is_required">Palvelimen tunniste vaaditaan</string>
<string name="server_book_no_servers_found">Palvelinkirja on tyhjä</string>
<string name="hello_blank_fragment">Hei tyhjä osa</string>
<string name="server_selection_filter_hint">Suodatetut</string>
<string name="pref_title_accept_insecure">Poista SSL-varmenteen tarkistus käytöstä</string>
<string name="pref_background_behavior">Taustatoisto</string>
<string name="pref_background_audio">Jatka äänen taustatoistolla</string>
<string name="pref_background_float">Jatka kuva-kuvassa -tilassa</string>
<string name="server_book_del_alert_msg">Haluatko varmasti poistaa tämän palvelimen osoitekirjasta\?</string>
<string name="settings_permissions_error_float">Kuva kuvassa -tilan lupa poistettu käytöstä Android-asetuksissa</string>
<string name="pref_background_behavior_summary">Kuinka toistettava video regoi, kun se menee taustalle</string>
<string name="clear_search_history_prompt">Haluatko poistaa hakuhistorian pysyvästi\?</string>
<string name="network_error">Verkkoyhteysvirhe, tarkista verkkoyhteys</string>
<string name="settings_api_error_float">Android-versio ei tue kuva-kuvassa -tilaa</string>
<string name="server_selection_video_totals">Videoita: %s, Paikallisia videoita: %s</string>
<string name="settings_activity_look_and_feel_category_title">Ulkoasu</string>
<string name="pref_background_stop">Pysäytä kaikki toistot</string>
<string name="me_help_and_feedback_button">Ohje ja palaute</string>
<string name="settings_activity_video_list_category_title">Videoluettelo</string>
<string name="settings_activity_about_category_title">Tietoa</string>
<string name="pref_title_back_pause">Keskeytä takaisin-napilla</string>
<string name="pref_description_back_pause">Keskeytä toisto, kun painat takaisin-nappia videotoiston aikana.</string>
<string name="server_selection_nsfw_instance">Sopimaton sisältö</string>
<string name="clear_search_history">Tyhjennä hakuhistoria</string>
<string name="settings_activity_video_playback_category_title">Videotoisto</string>
<string name="title_activity_select_server">Etsi palvelin</string>
<string name="server_book_del_alert_title">Poista palvelin</string>
<string name="bn_rBD">Bengali (Bangladesh)</string>
<string name="title_activity_server_address_book">Osoitekirja</string>
<string name="server_book_list_has_login">On kirjautunut</string>
<string name="server_book_add_server_url">Palvelimen URL</string>
<string name="me_logout_button">Kirjaudu ulos</string>
<string name="authentication_login_failed">Kirjautuminen epäonnistui!</string>
<string name="authentication_login_success">Kirjauduttu sisään</string>
<string name="server_book_add_save_button">Tallenna</string>
<string name="pref_insecure_confirm_yes">Kyllä</string>
<string name="pref_insecure_confirm_no">Ei</string>
<string name="pref_insecure_confirm_title">Varoitus!</string>
<string name="settings_activity_advanced_category_title">Kehittyneet</string>
<string name="menu_video_options_quality_automated">Automaattinen</string>
<string name="title_activity_me">Tili</string>
<string name="server_book_add_add_button">Lisää</string>
<string name="server_book_add_password">Salasana</string>
<string name="server_book_add_username">Käyttäjänimi</string>
<string name="server_book_add_pick_server_button">Hae</string>
<string name="server_book_add_label">Leima</string>
</resources> </resources>

View File

@ -348,11 +348,11 @@
<string name="network_error">Erro de acesso à rede, verifique sua conectividade</string> <string name="network_error">Erro de acesso à rede, verifique sua conectividade</string>
<string name="server_selection_filter_hint">Filtrar a lista</string> <string name="server_selection_filter_hint">Filtrar a lista</string>
<string name="settings_activity_advanced_category_title">Avançado</string> <string name="settings_activity_advanced_category_title">Avançado</string>
<string name="pref_insecure_confirm_message">Você está prestes a desativar toda a validação de certificação SSL no Thorium. Desativar isso pode ser muito perigoso se o servidor peertube não estiver sob seu controle, pois um ataque man-in-the-middle pode direcionar tráfego para outro servidor sem seu conhecimento. Um atacador pode gravar senhas e outros dados pessoais.</string> <string name="pref_insecure_confirm_message">Você está prestes a desativar toda a validação de certificação SSL no Thorium. Desativar isso pode ser muito perigoso se o servidor peertube não estiver sob seu controle, pois um ataque man-in-the-middle pode direcionar tráfego para outro servidor sem seu conhecimento. Um invasor pode gravar senhas e outros dados pessoais.</string>
<string name="pref_insecure_confirm_yes">Sim</string> <string name="pref_insecure_confirm_yes">Sim</string>
<string name="pref_insecure_confirm_no">Não</string> <string name="pref_insecure_confirm_no">Não</string>
<string name="pref_insecure_confirm_title">Aviso!</string> <string name="pref_insecure_confirm_title">Aviso!</string>
<string name="server_book_add_save_button">Salvar</string> <string name="server_book_add_save_button">Salvar</string>
<string name="pref_title_accept_insecure">Desativar check do certificado SSL</string> <string name="pref_title_accept_insecure">Desativar check do certificado SSL</string>
<string name="pref_description_accept_insecure">Ignorar conexões não seguras. Use isto apenas se você conhece o servidor ao qual está se conectando. Requer o reinício do app.</string> <string name="pref_description_accept_insecure">Ignorar conexões não seguras. Use isto apenas se você conhece o servidor ao qual está se conectando. Requer o reinício do aplicativo.</string>
</resources> </resources>

View File

@ -0,0 +1,2 @@
- Unterstützung für die Deaktivierung von SSL hinzufügt
- Übersetzungen

View File

@ -0,0 +1,5 @@
- Standardsprache der App beim ersten Start festgelegt (@kosharskiy)
- Bildschirmeinstellungen Übersetzungen uk und ru Sprache (@kosharskiy)
- app/build.gradle-Datei aufgeräumt (@kosharskiy)
- Problem mit der Anzeige von Video-Metadaten behoben (@kosharskiy)
- Übersetzungen aktualisiert

View File

@ -0,0 +1,2 @@
- Server bearbeiten im Serverbuch implementiert (@kosharskiy)
- Übersetzungen aktualisiert

View File

@ -0,0 +1 @@
- Todennuspäivitys

View File

@ -0,0 +1,2 @@
- lisää tuen poistaa käytöstä SSL
- käännökset

View File

@ -0,0 +1,2 @@
- Implemented edit server in server book (@kosharskiy)
- Päivitetyt käännökset

View File

@ -0,0 +1 @@
Throium on epävirallinen PeerTube -videosoitin

View File

@ -0,0 +1 @@
Throium on epävirallinen PeerTube -videosoitin

View File

@ -0,0 +1 @@
Thorium epävirallinen PeerTube -asiakasohjelma

View File

@ -0,0 +1 @@
https://www.youtube.com/watch?v=PJIsiuSdpq8

View File

@ -0,0 +1,2 @@
- Добавлена поддержка отключения SSL
- Переводы

View File

@ -0,0 +1,5 @@
- Исправлен язык приложения по умолчанию при первом запуске (@kosharskiy)
- Перевод настроек экрана на uk и ru языки (@kosharskiy)
- Файл очистки app/build.gradle (@kosharskiy)
- Исправлена проблема с отображением метаданных видео (@kosharskiy)
- Обновленные переводы

View File

@ -0,0 +1,2 @@
- Реализовано редактирование сервера в серверной книге (@kosharskiy)
- Обновлены переводы