From 2b975a3274aaf5cb6865b0379c63248ff3f9c0e9 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 14 Nov 2018 19:34:42 +0100 Subject: [PATCH 1/2] gitlab-ci: run LibScout on any APKs that were produced --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd02a75351..b4aaf47a8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,10 @@ fdroid-buildserver: artifacts: name: "${CI_PROJECT_PATH}_${CI_JOB_STAGE}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHA}" paths: + - json + - libscout-logs - logs + - stats - unsigned expire_in: 1 week when: always @@ -85,6 +88,15 @@ fdroid-buildserver: | sed -n -e 's,^metadata/\([^/][^/]*\)\.txt,\1,p' -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'` - echo $appids | grep '\w' || exit 0 - fdroid build --verbose --server --stop $EXTRA_FLAGS --latest $appids + - find unsigned -maxdepth 0 -empty -exec exit 0 \; + - cd ~/libscout + - java -jar build/LibScout.jar -o match -a lib/android-23.jar -p profiles + -j $CI_PROJECT_DIR/json + -s $CI_PROJECT_DIR/stats + -d $CI_PROJECT_DIR/libscout-logs + $CI_PROJECT_DIR/unsigned + - for f in $CI_PROJECT_DIR/libscout-logs/*.log; do printf "\n\n$f\n"; cut -b43-160 $f; done + - for f in `find $CI_PROJECT_DIR/json -name \*.json`; do cat $f | python3 -m json.tool; done after_script: - test -d builder || exit 0 - cd builder From f129254d82e0d0b506db003deaf5556d6124f39e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 14 Nov 2018 20:07:29 +0100 Subject: [PATCH 2/2] gitlab-ci: use official build flags for all builds --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4aaf47a8a..3714967aec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,17 +77,17 @@ fdroid-buildserver: - git -C /home/fdroid/fdroidserver checkout -B master origin/master - export PATH="$HOME/fdroidserver:$PATH" - if [ "$CI_PROJECT_NAMESPACE" = "fdroid" ]; then - export EXTRA_FLAGS="-Werror"; export head=HEAD^^^; + echo ORIG_HEAD `git diff --name-only --diff-filter=d ORIG_HEAD...HEAD + | sed -n -e 's,^metadata/\([^/][^/]*\)\.txt,\1,p' -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'`; else - export EXTRA_FLAGS="-Wwarn --test --force"; git fetch https://gitlab.com/fdroid/fdroiddata.git; export head=FETCH_HEAD; fi - export appids=`git diff --name-only --diff-filter=d $head...HEAD | sed -n -e 's,^metadata/\([^/][^/]*\)\.txt,\1,p' -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'` - echo $appids | grep '\w' || exit 0 - - fdroid build --verbose --server --stop $EXTRA_FLAGS --latest $appids + - fdroid build --verbose --server --stop --no-tarball --latest $appids - find unsigned -maxdepth 0 -empty -exec exit 0 \; - cd ~/libscout - java -jar build/LibScout.jar -o match -a lib/android-23.jar -p profiles