From 23e2566843ec60b6d6237fa1eb9f66ff869e514a6d90edbf5bb4b89d58442ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 5 May 2025 10:54:31 +0200 Subject: [PATCH] Fix git path compare of meta to pull request .git is optional, but doesn't matter, so trimming it away --- obs-staging-bot/main.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/obs-staging-bot/main.go b/obs-staging-bot/main.go index eab9074..ea184f1 100644 --- a/obs-staging-bot/main.go +++ b/obs-staging-bot/main.go @@ -575,8 +575,10 @@ func ProcessPullRequest(gitea common.Gitea, org, repo string, id int64) error { } else { metaUrl.RawQuery = "" metaUrl.Fragment = "" + metaUrl.Path = strings.TrimSuffix(metaUrl.Path, ".git") targetPRSyncUrl.RawQuery = "" targetPRSyncUrl.Fragment = "" + targetPRSyncUrl.Path = strings.TrimSuffix(targetPRSyncUrl.Path, ".git") if metaUrl.String() != targetPRSyncUrl.String() { common.LogError("SCMSYNC in meta", meta.ScmSync, "!= PR CloneURL from Gitea", pr.Base.Repo.CloneURL, ". Skipping staging") -- 2.51.1