From d7453d878d742ddf545385b1977ab78de41a33e4 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 17 Apr 2019 15:51:07 +0200 Subject: [PATCH 1/4] fix lint: Repeated word "do" in message: possible typo --- app/src/main/res/values-pt-rPT/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 0e8f85ea4..595fa5a80 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -437,7 +437,7 @@ Tem a certeza de que quer permitir que %1$s ative as ações do botão de pânico\? Definições do botão de pânico A aplicação ocultar-se-á - Em caso de pânico, isto remove %1$s do do ecrã inicial. Apenas se digitar \"%2$d\" na aplicação fictícia %3$s a poderá restaurar. + Em caso de pânico, isto remove %1$s do ecrã inicial. Apenas se digitar \"%2$d\" na aplicação fictícia %3$s a poderá restaurar. Tem a certeza de que quer remover %1$s do ecrã inicial\? Apenas se digitar \"%2$d\" na aplicação fictícia %3$s a poderá restaurar. Aviso: qualquer atalho existente no ecrã será removido e terá que ser adicionado manualmente. Servidores espelho oficiais From c5daf1981a7f00de16e19120ac42575c0e4bc424 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 17 Apr 2019 14:13:36 +0200 Subject: [PATCH 2/4] gitlab-ci: job must be called 'pages' to deploy to GitLab Pages https://docs.gitlab.com/ee/user/project/pages/getting_started_part_four.html#job fdroid/fdroidserver#649 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9b823fd9..857d06565 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -142,7 +142,7 @@ connected Q default x86_64: <<: *kvm-template -deploy_nightly: +pages: stage: deploy only: - master From dbe65f03656d7698405368d18e5c8d0adc9f38c5 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 9 Apr 2019 23:58:07 +0200 Subject: [PATCH 3/4] gitlab-ci: fix emulator install for android-Q --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 857d06565..cfe786ebe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,11 +67,12 @@ errorprone: - echo $AVD_PACKAGE - emulator -accel-check || true - - if [[ "$AVD_ARCH" != arm* ]]; then + - if [[ "$AVD_SDK" == Q ]]; then + set -x; echo y | sdkmanager --channel=3 "emulator" > /dev/null; set +x; + - elif [[ "$AVD_ARCH" != arm* ]]; then set -x; echo y | sdkmanager "emulator" > /dev/null; set +x; - elif [[ "$AVD_SDK" == Q ]]; then - set -x; echo y | sdkmanager --channel=2 "emulator" > /dev/null; set +x; fi + - grep Revision $ANDROID_HOME/emulator/source.properties - alias sdkmanager - echo y | sdkmanager "platforms;android-$AVD_SDK" > /dev/null @@ -97,7 +98,7 @@ errorprone: -skip-adb-auth -verbose -wipe-data - -debug-all + -debug all,-hw_control,-qemud,-sensors,-surface & - wait-for-emulator - adb devices From 003c448bbada594b44305fb01f65115d97d431c3 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 17 Apr 2019 19:40:31 +0200 Subject: [PATCH 4/4] gitlab-ci: only set ramsize if host has <4GB RAM --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cfe786ebe..31253807a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,8 +82,10 @@ errorprone: echo y | sdkmanager "$AVD_PACKAGE" > /dev/null; echo no | avdmanager create avd --name avd$AVD_SDK --tag "$AVD_TAG" --package "$AVD_PACKAGE" --sdcard 64M --device "Nexus 5"; export RAMSIZE="$((`sed -n 's,^MemAvailable:[^0-9]*\([0-9][0-9]*\)[^0-9]*$,\1,p' /proc/meminfo` * 3 / 4 / 1024))"; - sed -i '/^hw\.ramSize\s*=.*/d' ~/.android/avd/*.avd/config.ini; - echo "hw.ramSize=$RAMSIZE" >> ~/.android/avd/*.avd/config.ini; + if [ $RAMSIZE -lt 4096 ]; then + sed -i '/^hw\.ramSize\s*=.*/d' ~/.android/avd/*.avd/config.ini; + echo "hw.ramSize=$RAMSIZE" >> ~/.android/avd/*.avd/config.ini; + fi; avdmanager list avd; set +x; fi