From 179f81d90fefeb0d668d81411b4d8c6032e8fe25 Mon Sep 17 00:00:00 2001 From: Michal Karm Babacek Date: Tue, 9 Jul 2024 18:36:24 +0200 Subject: [PATCH] mx version, Windows Python utf-8 --- jenkins/jobs/builds/Constants.groovy | 2 ++ jenkins/jobs/builds/mandrel_24_1_linux_build_matrix.groovy | 4 ++-- jenkins/jobs/builds/mandrel_24_1_macos_build_matrix.groovy | 4 ++-- jenkins/jobs/builds/mandrel_24_1_windows_build_matrix.groovy | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jenkins/jobs/builds/Constants.groovy b/jenkins/jobs/builds/Constants.groovy index cf13a6c..cebcf2a 100644 --- a/jenkins/jobs/builds/Constants.groovy +++ b/jenkins/jobs/builds/Constants.groovy @@ -88,6 +88,8 @@ class Constants { for /F "tokens=*" %%i in (\'"git describe --always --long"\') do set M_DESCRIBE=%%i powershell -Command "$c=(Select-String -Path \'%JAVA_HOME%\\release\' -Pattern \'^^SOURCE\').Line -replace \'SOURCE=.*:([a-z0-9]*).*\', \'$1\';Write-Host MANDREL_DESCRIBE=%M_DESCRIBE% JDK git: $c" popd + SET PYTHONIOENCODING=utf-8 + SET PYTHONUTF8=1 powershell -Command "$c=Get-Content \'jenkins\\jobs\\scripts\\mandrel_windows_build.bat\';$c -replace \'.*JAVA_HOME=C.*\',\'set \\"JAVA_HOME=%JAVA_HOME%"\' | Out-File -Encoding ASCII -FilePath \'jenkins\\jobs\\scripts\\mandrel_windows_build.bat\';" jenkins\\jobs\\scripts\\mandrel_windows_build.bat ''' diff --git a/jenkins/jobs/builds/mandrel_24_1_linux_build_matrix.groovy b/jenkins/jobs/builds/mandrel_24_1_linux_build_matrix.groovy index aa046c4..ccd9f8e 100644 --- a/jenkins/jobs/builds/mandrel_24_1_linux_build_matrix.groovy +++ b/jenkins/jobs/builds/mandrel_24_1_linux_build_matrix.groovy @@ -81,9 +81,9 @@ matrixJob('mandrel-24-1-linux-build-matrix') { remote { url('https://github.com/graalvm/mx.git') } - branches('refs/tags/7.5.2') + branches('refs/tags/7.22.0') extensions { - localBranch('7.5.2') + localBranch('7.22.0') relativeTargetDirectory('mx') } } diff --git a/jenkins/jobs/builds/mandrel_24_1_macos_build_matrix.groovy b/jenkins/jobs/builds/mandrel_24_1_macos_build_matrix.groovy index 0afb167..d4cd009 100644 --- a/jenkins/jobs/builds/mandrel_24_1_macos_build_matrix.groovy +++ b/jenkins/jobs/builds/mandrel_24_1_macos_build_matrix.groovy @@ -81,9 +81,9 @@ matrixJob('mandrel-24-1-macos-build-matrix') { remote { url('https://github.com/graalvm/mx.git') } - branches('refs/tags/7.5.2') + branches('refs/tags/7.22.0') extensions { - localBranch('7.5.2') + localBranch('7.22.0') relativeTargetDirectory('mx') } } diff --git a/jenkins/jobs/builds/mandrel_24_1_windows_build_matrix.groovy b/jenkins/jobs/builds/mandrel_24_1_windows_build_matrix.groovy index 5ee1237..faf4d2f 100644 --- a/jenkins/jobs/builds/mandrel_24_1_windows_build_matrix.groovy +++ b/jenkins/jobs/builds/mandrel_24_1_windows_build_matrix.groovy @@ -81,9 +81,9 @@ matrixJob('mandrel-24-1-windows-build-matrix') { remote { url('https://github.com/graalvm/mx.git') } - branches('refs/tags/7.5.2') + branches('refs/tags/7.22.0') extensions { - localBranch('7.5.2') + localBranch('7.22.0') relativeTargetDirectory('mx') } }