sudoxreboot/fdroiddata
1
0
Fork 0
mirror of https://github.com/sudoxnym/fdroiddata.git synced 2026-07-13 17:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix fdroid build change detection on the default branch of fdroid/fdroiddata

Browse source
This commit is contained in:
proletarius101 2022-07-10 08:29:06 +00:00
parent f985acea46
commit bebb6e24a4
1 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
.gitlab-ci.yml
View file

@ -37,7 +37,7 @@ checkupdates:
set -xe set -xe
if [ "$CI_PROJECT_NAMESPACE" = "fdroid" ]; then echo "not testing in fdroid"; exit 0; fi if [ "$CI_PROJECT_NAMESPACE" = "fdroid" ]; then echo "not testing in fdroid"; exit 0; fi
git fetch https://gitlab.com/fdroid/fdroiddata.git git fetch https://gitlab.com/fdroid/fdroiddata.git
appids=$(git diff --name-only --diff-filter=d FETCH_HEAD...${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-HEAD} "metadata/*.yml" | sed -n -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p') appids=$(git diff --name-only --diff-filter=d ${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-FETCH_HEAD^}...HEAD "metadata/*.yml" | sed -n -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p')
if [ -n "$appids" ]; then if [ -n "$appids" ]; then
fdroid checkupdates --auto -v $appids fdroid checkupdates --auto -v $appids
git --no-pager diff --color=always --exit-code git --no-pager diff --color=always --exit-code
@ -67,7 +67,7 @@ lint:
- if [ "$CI_PROJECT_NAMESPACE" != "fdroid" ]; then - if [ "$CI_PROJECT_NAMESPACE" != "fdroid" ]; then
git fetch https://gitlab.com/fdroid/fdroiddata.git; git fetch https://gitlab.com/fdroid/fdroiddata.git;
test -d build || mkdir build; test -d build || mkdir build;
files=`git diff --name-only --diff-filter=d FETCH_HEAD...${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-HEAD}`; files=`git diff --name-only --diff-filter=d ${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-FETCH_HEAD^}...HEAD`;
for f in $files; do for f in $files; do
appid=`echo $f | sed -n -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'`; appid=`echo $f | sed -n -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'`;
if [ -n "$appid" ]; then if [ -n "$appid" ]; then
@ -121,7 +121,7 @@ schema validation:
- git fetch https://gitlab.com/fdroid/fdroiddata.git - git fetch https://gitlab.com/fdroid/fdroiddata.git
- set -xe - set -xe
- for file in - for file in
$(git diff --name-only --diff-filter=d FETCH_HEAD...${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-HEAD} -- "metadata/*.yml"); $(git diff --name-only --diff-filter=d ${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-FETCH_HEAD^}...HEAD -- "metadata/*.yml");
do do
ajv validate -s schemas/metadata.json -d "$file"; ajv validate -s schemas/metadata.json -d "$file";
done done
@ -250,19 +250,33 @@ fdroid build:
- /home/vagrant/.gradle - /home/vagrant/.gradle
script: script:
- unset CI - unset CI
- git fetch https://gitlab.com/fdroid/fdroiddata.git;
- test -d build || mkdir build - test -d build || mkdir build
- for f in - if [ "$CI_PROJECT_PATH" = "fdroid/fdroiddata" ] && [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
`git diff --name-only --diff-filter=d FETCH_HEAD...${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-HEAD} -- metadata/*.yml` for f in
`git diff --name-only --diff-filter=d FETCH_HEAD...${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-HEAD} -- metadata/*/signatures`; `git diff --name-only --diff-filter=d -- metadata/*.yml`
do `git diff --name-only --diff-filter=d -- metadata/*/signatures`;
diff=$(git diff FETCH_HEAD...${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-HEAD} -- $f); do
echo "$diff"; diff=$(git diff -- $f);
test $(echo "$diff" | grep '^[+-] ' | grep -v '^+ *disable:' | wc -l) = 0 && continue; echo "$diff";
echo "$diff" | grep -E '^\+ *(NoSourceSince|Disabled):' && continue; test $(echo "$diff" | grep '^[+-] ' | grep -v '^+ *disable:' | wc -l) = 0 && continue;
appid=`echo $f | sed -E -n 's,^metadata/([^/][^/]*)(\.yml|/signatures/.*),\1,p'`; echo "$diff" | grep -E '^\+ *(NoSourceSince|Disabled):' && continue;
export CHANGED="$CHANGED $appid"; appid=`echo $f | sed -E -n 's,^metadata/([^/][^/]*)(\.yml|/signatures/.*),\1,p'`;
done; export CHANGED="$CHANGED $appid";
done;
else
git fetch https://gitlab.com/fdroid/fdroiddata.git;
for f in
`git diff --name-only --diff-filter=d ${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-FETCH_HEAD^}...HEAD -- metadata/*.yml`
`git diff --name-only --diff-filter=d ${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-FETCH_HEAD^}...HEAD -- metadata/*/signatures`;
do
diff=$(git diff ${CI_EXTERNAL_PULL_REQUEST_TARGET_BRANCH_SHA:-FETCH_HEAD^}...HEAD -- $f);
echo "$diff";
test $(echo "$diff" | grep '^[+-] ' | grep -v '^+ *disable:' | wc -l) = 0 && continue;
echo "$diff" | grep -E '^\+ *(NoSourceSince|Disabled):' && continue;
appid=`echo $f | sed -E -n 's,^metadata/([^/][^/]*)(\.yml|/signatures/.*),\1,p'`;
export CHANGED="$CHANGED $appid";
done;
fi;
- test -n "$(printf "$CHANGED" | tr -d '[:space:]')" - test -n "$(printf "$CHANGED" | tr -d '[:space:]')"
|| { echo "no packages need processing, exiting"; exit 0; } || { echo "no packages need processing, exiting"; exit 0; }