From 894e1a8be0c41388901cf4edb4281bff00e9a904 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 21 May 2020 12:04:16 +0200 Subject: [PATCH 1/2] gitlab-ci: only look for .yml in fdroid-buildserver job --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2673928f2..fecab257cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,13 +155,13 @@ fdroid-buildserver: - if [ "$CI_PROJECT_NAMESPACE" = "fdroid" ]; then 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'`; + | sed -n -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'`; else 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'` + | sed -n -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'` - echo $appids | grep '\w' || exit 0 - fdroid build --verbose --server --stop --no-tarball --latest $appids - find unsigned -maxdepth 0 -empty -exec exit 0 \; From 47c0894f03e1bb90015aacdffd1792b8dabdd367 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 21 May 2020 12:04:43 +0200 Subject: [PATCH 2/2] hooks/pre-commit: only look for .yml files --- hooks/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/pre-commit b/hooks/pre-commit index 52b0085a31..d642303a75 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -7,7 +7,7 @@ set -o pipefail # Redirect output to stderr. exec 1>&2 -apps="$(git diff --cached --name-only --diff-filter=ACM | sed -n 's,metadata/\([^/]*\)\.txt,\1,p')" +apps="$(git diff --cached --name-only --diff-filter=ACM | sed -n 's,metadata/\([^/]*\)\.yml,\1,p')" if [[ -n "$apps" ]]; then fdroid lint -f $apps