Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions JenkinsJobs/Releng/promoteBuild.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
3 changes: 2 additions & 1 deletion sites/eclipse/build/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<main>

<h2>Eclipse <span class="data-ref">${release}</span> <span class="data-ref">${kind}</span> Build: <span class="data-ref">${label}</span></h2>
<h2>Eclipse <span class="data-ref">${release}</span> <span class="data-ref">${buildTypeName}</span> Build: <span class="data-ref">${label}</span></h2>
<p id="build-state-container"></p>
<p>
This page provides access to the various deliverables of Eclipse Platform build along with its logs and tests.
Expand Down Expand Up @@ -109,6 +109,7 @@ <h3 id="swt">SWT Binary and Source
</main>
<script>
loadPageData('buildproperties.json', data => {
data.buildTypeName = getBuildTypeName(data)
data.updatesP2RepositoryComposite = `https://download.eclipse.org/eclipse/updates/${data.releaseShort}`
const buildID = data.identifier
const buildType = buildID.charAt(0)
Expand Down
11 changes: 11 additions & 0 deletions sites/eclipse/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,17 @@ function getBuildType(buildData) {
return buildData.identifier.startsWith('Y') ? 'Y' : 'I'
}

function getBuildTypeName(buildData) {
const identifier = buildData.identifier
if (identifier.startsWith('R-')) {
return 'Release'
} else if (identifier.startsWith('S-')) {
return identifier.includes('RC') ? 'Release Candidate' : 'Stable'
} else {
return buildData.kind
}
}

function getWS(os) {
if (os == 'win32') {
return 'win32'
Expand Down
7 changes: 5 additions & 2 deletions sites/equinox/build/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>

<main>
<h2>Equinox <span class="data-ref">${kind}</span> Build: <span class="data-ref">${label}</span></h2>
<h2>Equinox <span class="data-ref">${buildTypeName}</span> Build: <span class="data-ref">${label}</span></h2>
<p id="build-state-container"></p>

<span id="build-timestamp"></span>
Expand Down Expand Up @@ -65,7 +65,10 @@ <h3 id="other">Other Information</h3>

</main>
<script>
loadPageData('buildproperties.json')
loadPageData('buildproperties.json', data => {
data.buildTypeName = getBuildTypeName(data)
return data
})

contentPostProcessor = (mainElement, build) => {
document.title = `Equinox - ${build.label}`
Expand Down
Loading