From 124b1c198b524b28e62bebf9a4445fb95ba2bf64 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Thu, 3 Apr 2025 00:53:17 +0200
Subject: [PATCH] [Build] Stash jdk-resources with respect to WS to prevent gtk
 conflicts

For linux.x86_64 the jdk-resources for gtk(3) and gtk4 are downloaded,
stashed and deleted into/from the same directory. This leads to
concurrency issues and build failures.
---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a7ababef5f3..641ee0e813e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -238,10 +238,10 @@ pipeline {
 						steps {
 							script {
 								def (ws, os, arch) = env.PLATFORM.split('\\.')
-								dir("jdk-download-${os}.${arch}") {
+								dir("jdk-download-${ws}.${arch}") {
 									// Fetch the JDK, which provides the C header-files and shared native libraries, against which the natives are build.
 									sh "curl ${getNativeJdkUrl(os, arch)} | tar -xzf - include/ lib/"
-									stash name:"jdk.resources.${os}.${arch}", includes: "include/,lib/"
+									stash name:"jdk.resources.${ws}.${arch}", includes: "include/,lib/"
 									deleteDir()
 								}
 								runOnNativeBuildAgent("${PLATFORM}") {
@@ -249,7 +249,7 @@ pipeline {
 									echo "OS: ${os}, ARCH: ${arch}"
 									unstash "swt.binaries.sources.${ws == 'gtk4' ? 'gtk' : ws }"
 									dir('jdk.resources') {
-										unstash "jdk.resources.${os}.${arch}"
+										unstash "jdk.resources.${ws}.${arch}"
 									}
 									withEnv(['MODEL=' + arch, "OUTPUT_DIR=${WORKSPACE}/libs", "SWT_JAVA_HOME=${WORKSPACE}/jdk.resources"]) {
 										if (isUnix()) {