Pixelfed/PixelDroid-App-Android
1
0
Fork 0
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid synced 2025-02-02 16:46:46 +01:00
Code Issues Releases Wiki Activity

Act on some of the security suggestions

Browse Source
This commit is contained in:
Matthieu 2022-07-11 10:00:00 +02:00
parent fd7296b2dd
commit f1be5733e0
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitlab-ci.yml
View File

@ -71,7 +71,7 @@ fdroid build:
allow_failure: true allow_failure: true
artifacts: artifacts:
paths: paths:
- unsigned/ - signed/
when: always when: always
only: only:
- tags - tags
@ -79,6 +79,7 @@ fdroid build:
key: "$CI_JOB_NAME" key: "$CI_JOB_NAME"
paths: paths:
- .gradle - .gradle
- .android
script: script:
# Put the correct versionName and versionCode in the .fdroid.yml # Put the correct versionName and versionCode in the .fdroid.yml
- sed -e "s/\${versionName}/$(grep "versionName " app/build.gradle | awk '{print $2}')/" -e "s/\${versionCode}/$(grep "versionCode" app/build.gradle | awk '{print $2}')/" .fdroid.yml.template > .fdroid.yml - sed -e "s/\${versionName}/$(grep "versionName " app/build.gradle | awk '{print $2}')/" -e "s/\${versionCode}/$(grep "versionCode" app/build.gradle | awk '{print $2}')/" .fdroid.yml.template > .fdroid.yml
@ -96,10 +97,10 @@ fdroid build:
- adduser --disabled-password --gecos "" vagrant - adduser --disabled-password --gecos "" vagrant
- ln -s $CI_PROJECT_DIR/fdroidserver /home/vagrant/fdroidserver - ln -s $CI_PROJECT_DIR/fdroidserver /home/vagrant/fdroidserver
- mkdir -p /vagrant/cache - mkdir -p /vagrant/cache
- wget -q https://services.gradle.org/distributions/gradle-5.6.2-bin.zip - wget -q https://services.gradle.org/distributions/gradle-5.6.2-bin.zip --output-document=/vagrant/cache/gradle-5.6.2-bin.zip
--output-document=/vagrant/cache/gradle-5.6.2-bin.zip - echo '32fce6628848f799b0ad3205ae8db67d0d828c10ffe62b748a7c0d9f4a5d9ee0 /vagrant/cache/gradle-5.6.2-bin.zip' | sha256sum -c
- bash fdroidserver/buildserver/provision-gradle - bash fdroidserver/buildserver/provision-gradle
- bash fdroidserver/buildserver/provision-apt-get-install http://deb.debian.org/debian - bash fdroidserver/buildserver/provision-apt-get-install https://deb.debian.org/debian
- source /etc/profile.d/bsenv.sh - source /etc/profile.d/bsenv.sh
- apt-get dist-upgrade - apt-get dist-upgrade
@ -111,11 +112,16 @@ fdroid build:
python3-ruamel.yaml python3-ruamel.yaml
yamllint yamllint
- apt-get purge fdroidserver - apt-get purge fdroidserver
- export GRADLE_USER_HOME=$PWD/.gradle - export GRADLE_USER_HOME=$PWD/.gradle
# each `fdroid build --on-server` run expects sudo, then uninstalls it # each fdroid build --on-server run expects sudo, then uninstalls it
- set -x - set -x
- apt-get install sudo - apt-get install sudo
- fdroid fetchsrclibs --verbose - fdroid fetchsrclibs --verbose
# this builds the latest version of the app from its source dir, using the build recipe in .fdroid.yml # this builds the latest version of the app from its source dir, using the build recipe in .fdroid.yml
- fdroid build --verbose --on-server --no-tarball - fdroid build --verbose --on-server --no-tarball
# create a keystore if we don’t have one
- ls .android || mkdir .android
- ls .android/debug.keystore || keytool -genkey -v -keystore .android/debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname 'C=US, O=Android, CN=Android Debug'
# sign the apk
- cp -R unsigned signed
- jarsigner -verbose -keystore .android/debug.keystore -storepass android -keypass android signed/*.apk androiddebugkey

5
app/build.gradle
View File

@ -94,7 +94,12 @@ android {
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
lint { lint {
//We can't expect translators to always keep up immediately:
// don't fail if a a string is untranslated
disable 'MissingTranslation' disable 'MissingTranslation'
// This lint indicates a wrong translation:
// Remove this exception once https://github.com/WeblateOrg/weblate/issues/7520 is solved
disable 'MissingQuantity'
} }
} }