summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-05-07 03:13:29 +0200
committerSven Gothel <[email protected]>2023-05-07 03:13:29 +0200
commitd6bd536929895cbf0a2ac228e285c2a77e94caf8 (patch)
tree9e55013d0af0cb945aecffb31c0a62028f5f7d47
parent7296e85aff17ba551d5a95782cced537ad56b372 (diff)
jenkins windows node: Fix cmake path (use explicit cmake, not cygwin)
-rwxr-xr-xjenkins-server-slave-setup/nodes/sgothel-win64-multi-010/windows-x86_32-jau-010.bat2
-rwxr-xr-xjenkins-server-slave-setup/nodes/sgothel-win64-multi-010/windows-x86_64-jau-011.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/windows-x86_32-jau-010.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/windows-x86_32-jau-010.bat
index 64ad832..e19bf69 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/windows-x86_32-jau-010.bat
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/windows-x86_32-jau-010.bat
@@ -4,7 +4,7 @@ set ANT_PATH=C:\apache-ant-1.10.5
set GIT_PATH=C:\cygwin64\bin
set SEVENZIP=C:\Program Files\7-Zip
-set CMAKE_PATH=C:\cmake-3.25.1-windows-x64_64
+set CMAKE_PATH=C:\cmake-3.25.1-windows-x86_64
set CMAKE_C_COMPILER=c:\mingw64\bin\gcc
set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/windows-x86_64-jau-011.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/windows-x86_64-jau-011.bat
index 5e43d1f..8eba50f 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/windows-x86_64-jau-011.bat
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/windows-x86_64-jau-011.bat
@@ -4,7 +4,7 @@ set ANT_PATH=C:\apache-ant-1.10.5
set GIT_PATH=C:\cygwin64\bin
set SEVENZIP=C:\Program Files\7-Zip
-set CMAKE_PATH=C:\cmake-3.25.1-windows-x64_64
+set CMAKE_PATH=C:\cmake-3.25.1-windows-x86_64
set CMAKE_C_COMPILER=c:\mingw64\bin\gcc
set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%