From ad52ed071e6f3f0d3bce867d6a59083aa31eace3 Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Fri, 7 Oct 2022 13:43:35 +0200
Subject: [PATCH] iris-bot: dont rely on 'origin' remote being upstream
---
iris-bot | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/iris-bot b/iris-bot
index 75ed999f5..8f2b36114 100755
--- a/iris-bot
+++ b/iris-bot
@@ -118,8 +118,8 @@ def time(args):
subprocess.run(["git", "fetch", "-q", "https://gitlab.mpi-sws.org/{}".format(iris_repo), iris_rev], check=True)
test_commit = subprocess.run(["git", "rev-parse", "FETCH_HEAD"], check=True, stdout=subprocess.PIPE).stdout.decode().strip()
# Determine the base commit in master
- subprocess.run(["git", "fetch", "-q", "origin", "master"], check=True)
- base_commit = subprocess.run(["git", "merge-base", test_commit, "origin/master"], check=True, stdout=subprocess.PIPE).stdout.decode().strip()
+ subprocess.run(["git", "fetch", "-q", "https://gitlab.mpi-sws.org/iris/iris.git", "master"], check=True)
+ base_commit = subprocess.run(["git", "merge-base", test_commit, "FETCH_HEAD"], check=True, stdout=subprocess.PIPE).stdout.decode().strip()
# Trigger the builds
print("Triggering timing builds for {} with Iris base commit {} and test commit {} using ad-hoc ID {}...".format(project_name, base_commit[:8], test_commit[:8], id))
vars = {
--
GitLab