From d45a2a747f32e6b2b78e0e92155be34b4a67b46c Mon Sep 17 00:00:00 2001 From: Frederic Devernay Date: Sat, 3 Apr 2021 15:02:01 -0700 Subject: [PATCH] launchBuildMain: execute the repo's version if newer --- tools/jenkins/launchBuildMain.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/jenkins/launchBuildMain.sh b/tools/jenkins/launchBuildMain.sh index d247e8a85f..391b3874cc 100755 --- a/tools/jenkins/launchBuildMain.sh +++ b/tools/jenkins/launchBuildMain.sh @@ -451,6 +451,9 @@ if [ "${GIT_URL_IS_NATRON:-}" = "1" ]; then if [ "$TMP_PATH/Natron/tools/jenkins/launchBuildMain.sh" -nt "launchBuildMain.sh" ]; then echo "Warning: launchBuildMain.sh has changed since the last SDK build. SDK may need to be rebuilt. Continuing anyway after a 5s pause." sleep 5 + mv ./launchBuildMain.sh ./launchBuildMain.sh.orig + cp "$TMP_PATH/Natron/tools/jenkins/launchBuildMain.sh" ./launchBuildMain.sh + exec ./launchBuildMain.sh "$*" fi if [ -z "${NOUPDATE:+x}" ]; then (cd "$TMP_PATH/Natron/tools/jenkins"; tar --exclude launchBuildMain.sh -cf - .) | tar xf -