Skip to content

Commit b58ef11

Browse files
committed
contrib/ci.inria.fr: support PR URLs with slashes as branch names
Signed-off-by: Brice Goglin <[email protected]>
1 parent 2ccb19d commit b58ef11

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

contrib/ci.inria.fr/job-0-tarball.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@ echo "Got GIT branch name $branch"
2323
# environment variables
2424
test -f $HOME/.ciprofile && . $HOME/.ciprofile
2525

26+
# convert "pr/XYZ/head" into "PR-XYZ"
27+
branch=$(echo $branch | sed -r -e 's@pr/([0-9]+)/head@PR-\1@')
28+
2629
# keep branch-name before the first - (e.g. v2.0-beta becomes v2.0)
27-
# and look for the corresponding autotools
30+
# and look for the corresponding autotools.
31+
# "PR-XYZ" will get "PR" which means they'll use master autotools (likely OK)
2832
basebranch=$( echo $branch | sed -r -e 's@^.*/([^/]+)$@\1@' -e 's/-.*//' )
2933
if test -d $HOME/local/hwloc-$basebranch ; then
3034
export PATH=$HOME/local/hwloc-${basebranch}/bin:$PATH

0 commit comments

Comments
 (0)