Skip to content

Commit 677301b

Browse files
committed
gitlab-ci: make gradle job show files with trigger it
For some reason, this logic thinks that this merge request has changed makebuildserver and/or gradlew-fdroid, though it clearly has not. This should shed some light on it. https://gitlab.com/fdroid/fdroidserver/-/jobs/9835383262
1 parent f281068 commit 677301b

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

.gitlab-ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,8 @@ macOS:
469469

470470
gradle:
471471
image: debian:bookworm-slim
472+
rules:
473+
- if: "$PERSONAL_ACCESS_TOKEN"
472474
<<: *apt-template
473475
variables:
474476
GIT_DEPTH: 1000
@@ -485,12 +487,15 @@ gradle:
485487
python3-requests
486488
# if this is a merge request fork, then only check if relevant files changed
487489
- if [ "$CI_PROJECT_NAMESPACE" != "fdroid" ]; then
490+
set -x;
488491
git fetch https://gitlab.com/fdroid/fdroidserver.git;
489492
for f in `git diff --name-only --diff-filter=d FETCH_HEAD...HEAD`; do
490-
test "$f" == "makebuildserver" && export CHANGED="yes";
491-
test "$f" == "gradlew-fdroid" && export CHANGED="yes";
493+
test "$f" == "makebuildserver" && export CHANGED="$f $CHANGED";
494+
test "$f" == "gradlew-fdroid" && export CHANGED="$f $CHANGED";
492495
done;
493496
test -z "$CHANGED" && exit;
497+
echo $CHANGED;
498+
set +x;
494499
fi
495500
- ./tests/gradle-release-checksums.py
496501

0 commit comments

Comments
 (0)