From ffb53b2c8493b51eb5150715dd06f2f7462ab869 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Mon, 5 Jan 2026 19:48:15 +0100 Subject: [PATCH] Compute 'build type name' in build website's javascript This simplifies the RelEng tasks and places the display logic where it's used. --- JenkinsJobs/Releng/promoteBuild.jenkinsfile | 14 +++----------- sites/eclipse/build/index.html | 3 ++- sites/eclipse/page.js | 11 +++++++++++ sites/equinox/build/index.html | 7 +++++-- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/JenkinsJobs/Releng/promoteBuild.jenkinsfile b/JenkinsJobs/Releng/promoteBuild.jenkinsfile index 34c0a6b334a..9b5e708219d 100644 --- a/JenkinsJobs/Releng/promoteBuild.jenkinsfile +++ b/JenkinsJobs/Releng/promoteBuild.jenkinsfile @@ -352,18 +352,10 @@ EOF utilities.modifyJSON('buildproperties.json') { buildProperties -> buildProperties.identifier = newDropID buildProperties.label = newBuildLabel - if ("${DL_TYPE}" == 'R') { - buildProperties.kind = 'Release' - } else if (newBuildLabel.contains('RC')) { - buildProperties.kind = 'Release Candidate' - } else if ("${DL_TYPE}" == 'S') { - buildProperties.kind = 'Stable' - } else { - error "Unexpected DL_TYPE value, ${DL_TYPE}" - } - buildProperties.values().each{ value -> + // Update filenames in lists + for (value in buildProperties.values()) { if (value instanceof List) { - value.each{ fileData -> + for (fileData in value) { if('name' in fileData) { fileData.name = fileData.name.replace(oldBuildLabel, newBuildLabel) } diff --git a/sites/eclipse/build/index.html b/sites/eclipse/build/index.html index 35ada23f044..c7da2c595e7 100644 --- a/sites/eclipse/build/index.html +++ b/sites/eclipse/build/index.html @@ -17,7 +17,7 @@
-

Eclipse ${release} ${kind} Build: ${label}

+

Eclipse ${release} ${buildTypeName} Build: ${label}

This page provides access to the various deliverables of Eclipse Platform build along with its logs and tests. @@ -109,6 +109,7 @@

SWT Binary and Source