From 71950dfb67819ff819fdca3d825bf6c82116ebf8 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 9 Jun 2021 19:03:59 +0200 Subject: [PATCH] gitlab-ci: move audit-gradle.py run to `fdroid build` job This test script was effectively not running anyway because nothing was cloning the git repo for it to run on. `fdroid build` will end up cloning the source, so it makes sense to run this script after that process. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d228dd4757..0cea2e996c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,14 +29,12 @@ lint: appid=`echo $f | sed -n -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'`; if [ -n "$appid" ]; then export CHANGED="$CHANGED $appid"; - testcmd="git -C build clone `sed -En 's,^Repo\W +(https?://),\1u:p@,p' $f`"; fi; done; set -x; apt-get install python3-colorama yamllint; for f in $files; do [[ $f == *'.yml' ]] && yamllint "$f"; done; ./tools/check-git-repo-availability.py $files; - ./tools/audit-gradle.py $CHANGED; set +x; fi - export EXITVALUE=0 @@ -245,6 +243,8 @@ fdroid build: $fdroid publish --verbose $build; done + - ./tools/audit-gradle.py $CHANGED; + # issuebot needs secrets to run, so it has to run under the 'fdroid' # group, therefore needs the trigger without secrets, there would be