From 2ea7b9ba4172ce43d1642efd49c81caeac7504f6 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 2 Jan 2026 11:38:01 +0100 Subject: [PATCH] add support for absolute revisions --- jenkins/build.sh | 7 ++++++- jenkins/static_analysis.sh | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jenkins/build.sh b/jenkins/build.sh index 92e800d..2c6ed52 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -10,7 +10,12 @@ upstreamRev[opm-grid]=master if grep -q "opm-common=" <<< $ghprbCommentBody then - upstreamRev[opm-common]=pull/`echo $ghprbCommentBody | sed -r 's/.*opm-common=([0-9]+).*/\1/g'`/merge + if test -n "$absolute_revisions" + then + upstreamRev[opm-common]=$(echo $ghprbCommentBody | sed -r 's/.*opm-common=([^ ]+)/\1/g') + else + upstreamRev[opm-common]=pull/$(echo $ghprbCommentBody | sed -r 's/.*opm-common=([0-9]+).*/\1/g')/merge + fi fi # Currently no downstreams diff --git a/jenkins/static_analysis.sh b/jenkins/static_analysis.sh index 55472f1..c0f8a86 100755 --- a/jenkins/static_analysis.sh +++ b/jenkins/static_analysis.sh @@ -10,7 +10,12 @@ upstreamRev[opm-grid]=master if grep -q "opm-common=" <<< $ghprbCommentBody then - upstreamRev[opm-common]=pull/`echo $ghprbCommentBody | sed -r 's/.*opm-common=([0-9]+).*/\1/g'`/merge + if test -n "$absolute_revisions" + then + upstreamRev[opm-common]=$(echo $ghprbCommentBody | sed -r 's/.*opm-common=([^ ]+)/\1/g') + else + upstreamRev[opm-common]=pull/$(echo $ghprbCommentBody | sed -r 's/.*opm-common=([0-9]+).*/\1/g')/merge + fi fi # Clone opm-common