Merge branch 'remove-txt-traces' into 'master'

Remove txt traces

See merge request fdroid/fdroiddata!6829
This commit is contained in:
Hans-Christoph Steiner 2020-05-26 09:28:30 +00:00
commit cca3df360a
2 changed files with 3 additions and 3 deletions

View file

@ -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 \;

View file

@ -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