Adds missing workflow-related file.

Signed-off-by: Franco Cipollone <[email protected]>
maliput · Oct 3, 2023 · fca7616 · fca7616
1 parent e6f29e9
commit fca7616
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/.github/try_vcs_checkout b/.github/try_vcs_checkout
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Copyright 2023 Woven By Toyota
+
+CHANGE_BRANCH=$1
+SRC_FOLDER=$2
+
+echo try checking out ${CHANGE_BRANCH}
+vcs custom $SRC_FOLDER --args branch -f $CHANGE_BRANCH origin/$CHANGE_BRANCH > /dev/null || true
+vcs custom $SRC_FOLDER --args merge --no-edit $CHANGE_BRANCH  > /dev/null || true
+DIFF=$(vcs diff -s $SRC_FOLDER | tr -d '.\n')
+if [ ! -z "$DIFF" ]; then
+    echo "Have merge conflicts!"
+    echo $DIFF
+    exit 1
+fi
+vcs status $SRC_FOLDER