diff options
| author | David Lönnhager <david.l@mullvad.net> | 2026-03-26 11:10:35 +0000 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2026-03-26 11:10:46 +0000 |
| commit | 8f14414422ecb4873377e87373fcccdad2bd9f0c (patch) | |
| tree | c658afc597a473116c791ea9ccdf57cfcc5080e2 | |
| parent | 27ec9683ba21c40fc4dc0d825119733cc7eb63ad (diff) | |
| download | mullvadvpn-buildserver-check.tar.xz mullvadvpn-buildserver-check.zip | |
Only check commits that land on mainbuildserver-check
| -rwxr-xr-x | scripts/check-build-server.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/check-build-server.sh b/scripts/check-build-server.sh index 8fa306e0f5..9f4ef0f674 100755 --- a/scripts/check-build-server.sh +++ b/scripts/check-build-server.sh @@ -91,8 +91,9 @@ parse_args() { get_commits() { cd "$REPO_ROOT" - # Return full hashes - we'll truncate later when needed - git log --format="%H %ct" main --max-count="$COMMITS_TO_CHECK" + # Use --first-parent to only follow the main branch line + # This excludes commits from merged feature branches + git log --first-parent --format="%H %ct" main --max-count="$COMMITS_TO_CHECK" } get_commit_version() { |