From 3af6a0e75d9b442865ff752cd0880156b8f079bf Mon Sep 17 00:00:00 2001 From: arun3688 Date: Fri, 22 Mar 2024 11:10:24 +0100 Subject: [PATCH 1/2] attempts to fix git path in windows --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bae0615b4..2c1be53ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -225,7 +225,7 @@ pipeline { label 'M1' } environment { - PATH="/opt/homebrew/bin:/opt/homebrew/opt/openjdk/bin:/opt/homebrew/opt/icu4c/bin:/opt/homebrew/opt/icu4c/sbin:/usr/local/bin:${env.PATH}" + PATH="/opt/homebrew/bin:/opt/homebrew/opt/openjdk/bin:/opt/homebrew/opt/icu4c/bin:/opt/homebrew/opt/icu4c/sbin:/usr/local/bin:${env.PATH}" PKG_CONFIG_PATH="/opt/homebrew/opt/icu4c/lib/pkgconfig" LDFLAGS="-L/opt/homebrew/opt/icu4c/lib" CPPFLAGS="-I/opt/homebrew/opt/icu4c/include" @@ -385,7 +385,7 @@ EXIT /b 1 bat 'hostname' writeFile file: "buildZip.sh", text: """#!/bin/sh set -x -e -export PATH="/c/Program Files/TortoiseSVN/bin/:/c/bin/jdk/bin:/c/bin/nsis/:\$PATH:/c/bin/git/bin" +export PATH="/c/Program Files/TortoiseSVN/bin/:C:/Program Files/Git/bin/:/c/bin/jdk/bin:/c/bin/nsis/:\$PATH:/c/bin/git/bin" cd "${env.WORKSPACE}/install/" zip -r "../OMSimulator-win64-`git describe --tags --abbrev=7 --match=v*.* --exclude=*-dev | sed \'s/-/.post/\'`.zip" * """ From f1b6cb0e3bc7d90e8d2b654d1df6a6dcaf9be61e Mon Sep 17 00:00:00 2001 From: arun3688 Date: Fri, 22 Mar 2024 11:35:26 +0100 Subject: [PATCH 2/2] fix path in msys format --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2c1be53ff..432232f99 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -385,7 +385,7 @@ EXIT /b 1 bat 'hostname' writeFile file: "buildZip.sh", text: """#!/bin/sh set -x -e -export PATH="/c/Program Files/TortoiseSVN/bin/:C:/Program Files/Git/bin/:/c/bin/jdk/bin:/c/bin/nsis/:\$PATH:/c/bin/git/bin" +export PATH="/c/Program Files/TortoiseSVN/bin/:/c/Program Files/Git/bin/:/c/bin/jdk/bin:/c/bin/nsis/:\$PATH:/c/bin/git/bin" cd "${env.WORKSPACE}/install/" zip -r "../OMSimulator-win64-`git describe --tags --abbrev=7 --match=v*.* --exclude=*-dev | sed \'s/-/.post/\'`.zip" * """