Skip to content

Commit f504361

Browse files
committed
Fix GraalVM Native Image Builds on Jenkins.
- Updated to GraalVM 22.0.0.2 in LemMinX - Updated to native-maven-plugin 0.9.10 in LemMinX Signed-off-by: Roland Grunberg <[email protected]>
1 parent 4accd94 commit f504361

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

NativeImage.jenkins

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ pipeline {
2828
}
2929
}
3030
sh "cd lemminx && JAVA_HOME=\$GRAALVM_PATH ./mvnw clean package -B -Dnative -DskipTests -Dgraalvm.static='--static -H:+StaticExecutableWithDynamicLibC' && cd .."
31+
sh "rm lemminx/org.eclipse.lemminx/target/*.build_artifacts.txt"
3132
sh "cp lemminx/org.eclipse.lemminx/target/lemminx-linux* lemminx-linux"
3233
stash name: 'lemminx-linux', includes: 'lemminx-linux'
3334
}
@@ -61,15 +62,15 @@ pipeline {
6162
powershell """
6263
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
6364
if (-not (Test-Path graalvm-windows-${params.GRAALVM_VERSION}.zip)) {
64-
Invoke-WebRequest https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${params.GRAALVM_VERSION}/graalvm-ce-java11-windows-amd64-${params.GRAALVM_VERSION}.zip -OutFile graalvm-windows-${params.GRAALVM_VERSION}.zip
65+
Invoke-WebRequest https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${params.GRAALVM_VERSION}/graalvm-ce-java17-windows-amd64-${params.GRAALVM_VERSION}.zip -OutFile graalvm-windows-${params.GRAALVM_VERSION}.zip
6566
Expand-Archive graalvm-windows-${params.GRAALVM_VERSION}.zip
66-
.\\graalvm-windows-${params.GRAALVM_VERSION}\\graalvm-ce-java11-${params.GRAALVM_VERSION}\\bin\\gu install native-image
67+
.\\graalvm-windows-${params.GRAALVM_VERSION}\\graalvm-ce-java17-${params.GRAALVM_VERSION}\\bin\\gu install native-image
6768
}
6869
"""
6970
bat """
7071
pushd .
7172
setlocal
72-
set JAVA_HOME=%cd%\\graalvm-windows-${params.GRAALVM_VERSION}\\graalvm-ce-java11-${params.GRAALVM_VERSION}
73+
set JAVA_HOME=%cd%\\graalvm-windows-${params.GRAALVM_VERSION}\\graalvm-ce-java17-${params.GRAALVM_VERSION}
7374
call \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat\"
7475
popd
7576
cd lemminx
@@ -100,12 +101,13 @@ pipeline {
100101
}
101102
sh """
102103
if [ ! -f graalvm-darwin-${params.GRAALVM_VERSION}.tar.gz ]; then
103-
curl https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${params.GRAALVM_VERSION}/graalvm-ce-java8-darwin-amd64-${params.GRAALVM_VERSION}.tar.gz -L --output graalvm-darwin-${params.GRAALVM_VERSION}.tar.gz
104+
curl https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${params.GRAALVM_VERSION}/graalvm-ce-java17-darwin-amd64-${params.GRAALVM_VERSION}.tar.gz -L --output graalvm-darwin-${params.GRAALVM_VERSION}.tar.gz
104105
tar -xzf graalvm-darwin-${params.GRAALVM_VERSION}.tar.gz
105-
./graalvm-ce-java8-${params.GRAALVM_VERSION}/Contents/Home/bin/gu install native-image
106+
./graalvm-ce-java17-${params.GRAALVM_VERSION}/Contents/Home/bin/gu install native-image
106107
fi
107108
"""
108-
sh "cd lemminx && JAVA_HOME=../graalvm-ce-java8-${params.GRAALVM_VERSION}/Contents/Home ./mvnw clean package -B -Dnative -DskipTests && cd .."
109+
sh "cd lemminx && JAVA_HOME=`pwd`/../graalvm-ce-java17-${params.GRAALVM_VERSION}/Contents/Home ./mvnw clean package -B -Dnative -DskipTests && cd .."
110+
sh "rm lemminx/org.eclipse.lemminx/target/*.build_artifacts.txt"
109111
sh "cp lemminx/org.eclipse.lemminx/target/lemminx-osx-x86_64* lemminx-osx-x86_64"
110112

111113
stash name: 'lemminx-osx-x86_64', includes: 'lemminx-osx-x86_64'

0 commit comments

Comments
 (0)