Restructure pipelines to improve speed
This commit is contained in:
parent
c2becae5f2
commit
6a5c3fda4f
|
@ -12,26 +12,36 @@ stages:
|
||||||
- deploy
|
- deploy
|
||||||
|
|
||||||
.gradle-default:
|
.gradle-default:
|
||||||
stage: build
|
|
||||||
before_script:
|
before_script:
|
||||||
- export GRADLE_USER_HOME=$(pwd)/.gradle
|
- export GRADLE_USER_HOME=$(pwd)/.gradle
|
||||||
- chmod +x ./gradlew
|
- chmod +x ./gradlew
|
||||||
- mkdir -p .android && touch .android/repositories.cfg
|
- mkdir -p .android && touch .android/repositories.cfg
|
||||||
script:
|
script:
|
||||||
- echo "Overwrite me"
|
- echo "Overwrite me"
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
key: ${CI_PROJECT_ID}
|
key: ${CI_PROJECT_ID}
|
||||||
paths:
|
paths:
|
||||||
- .gradle/
|
- .gradle/wrapper
|
||||||
|
- .gradle/caches
|
||||||
|
- app/build
|
||||||
|
|
||||||
.build:
|
.build:
|
||||||
|
stage: build
|
||||||
|
extends: .gradle-default
|
||||||
|
variables:
|
||||||
|
apk_file: 'app/build/outputs/apk/debug/app-debug.apk'
|
||||||
|
metadata_file: 'metadata/audio.funkwhale.android.yml'
|
||||||
before_script:
|
before_script:
|
||||||
- git fetch --unshallow --tags
|
- git fetch --unshallow --tags
|
||||||
extends: .gradle-default
|
after_script:
|
||||||
|
- export versionCode=`$ANDROID_HOME/build-tools/30.0.2/aapt dump badging $apk_file | grep versionCode | awk '{print $3}' | sed s/versionCode=//g | sed s/\'//g`
|
||||||
|
- apt update && apt install gettext-base
|
||||||
|
- cat metadata/template.yml | envsubst > $metadata_file
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- app/build/outputs/apk/debug/app-debug.apk
|
- $apk_file
|
||||||
|
- $metadata_file
|
||||||
|
- app/build/outputs/apk/debug/output-metadata.json
|
||||||
|
|
||||||
test:
|
test:
|
||||||
extends: .gradle-default
|
extends: .gradle-default
|
||||||
|
@ -81,6 +91,8 @@ deploy-develop:
|
||||||
- eval `ssh-agent -s`
|
- eval `ssh-agent -s`
|
||||||
- ssh-add <(echo "$SSH_PRIVATE_KEY")
|
- ssh-add <(echo "$SSH_PRIVATE_KEY")
|
||||||
- scp -o StrictHostKeyChecking=no app/build/outputs/apk/debug/app-debug.apk fdroid@apps.funkwhale.audio:/srv/fdroid/fdroid/develop/repo/audio.funkwhale.ffa.dev-$CI_COMMIT_SHORT_SHA.apk
|
- scp -o StrictHostKeyChecking=no app/build/outputs/apk/debug/app-debug.apk fdroid@apps.funkwhale.audio:/srv/fdroid/fdroid/develop/repo/audio.funkwhale.ffa.dev-$CI_COMMIT_SHORT_SHA.apk
|
||||||
|
- scp -o StrictHostKeyChecking=no app/build/outputs/apk/debug/output-metadata.json fdroid@apps.funkwhale.audio:/srv/fdroid/fdroid/develop/output-metadata.json
|
||||||
|
- scp -o StrictHostKeyChecking=no metadata/audio.funkwhale.android.yml fdroid@apps.funkwhale.audio:/srv/fdroid/fdroid/develop/metadata/audio.funkwhale.ffa.dev.yml
|
||||||
- ssh -o StrictHostKeyChecking=no fdroid@apps.funkwhale.audio 'docker run --rm -u $(id -u):$(id -g) -v /srv/fdroid/fdroid/develop:/repo registry.gitlab.com/fdroid/docker-executable-fdroidserver:master update'
|
- ssh -o StrictHostKeyChecking=no fdroid@apps.funkwhale.audio 'docker run --rm -u $(id -u):$(id -g) -v /srv/fdroid/fdroid/develop:/repo registry.gitlab.com/fdroid/docker-executable-fdroidserver:master update'
|
||||||
tags:
|
tags:
|
||||||
- shell
|
- shell
|
||||||
|
|
|
@ -4,3 +4,4 @@ kotlin.code.style=official
|
||||||
|
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
|
org.gradle.caching=true
|
Loading…
Reference in New Issue