Skip to content

Commit ae69bd9

Browse files
committed
[Build] Fix formatting and typos in Jenkins pipeline
1 parent 5115799 commit ae69bd9

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Jenkinsfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def runOnNativeBuildAgent(String platform, Closure body) {
4444

4545
/** Returns the download URL of the JDK against whose C headers (in the 'include/' folder) and native libraries the SWT natives are compiled.*/
4646
def getNativeJdkUrl(String os, String arch) { // To update the used JDK version update the URL template below
47-
if('win32'.equals(os) && 'aarch64'.equals(arch)) {
47+
if ('win32'.equals(os) && 'aarch64'.equals(arch)) {
4848
// Temporary workaround until there are official Temurin GA releases for Windows on ARM that can be consumed through JustJ
4949
dir("${WORKSPACE}/repackage-win32.aarch64-jdk") {
5050
sh """
@@ -86,7 +86,7 @@ def Set NATIVES_CHANGED = []
8686

8787
pipeline {
8888
options {
89-
skipDefaultCheckout() // Specialiced checkout is performed below
89+
skipDefaultCheckout() // Specialized checkout is performed below
9090
timestamps()
9191
timeout(time: 180, unit: 'MINUTES')
9292
buildDiscarder(logRotator(numToKeepStr: 'master'.equals(env.BRANCH_NAME) ? '20' : '5', artifactNumToKeepStr: 'master'.equals(env.BRANCH_NAME) ? '3' : '1' ))
@@ -117,7 +117,7 @@ pipeline {
117117
def authorMail = sh(script: 'git log -1 --pretty=format:"%ce" HEAD', returnStdout: true)
118118
echo 'HEAD commit author: ' + authorMail
119119
if ('eclipse-releng-bot@eclipse.org'.equals(authorMail) && !params.forceNativeBuilds) {
120-
// Prevent endless build-loops due to self triggering because of a previous automated build of SWT-natives and the associated updates.
120+
// Prevent endless build-loops due to self triggering because of a previous automated build of natives and the associated updates.
121121
currentBuild.result = 'ABORTED'
122122
error('Abort build only triggered by automated SWT-natives update.')
123123
}
@@ -157,7 +157,7 @@ pipeline {
157157
'''
158158
def sourceFoldersProps = readProperties(file: 'nativeSourceFolders.properties')
159159
def sources = sourceFoldersProps.collectEntries{ k, src -> [ k, src.split(',').collect{ f -> '\'' + f + '\''}.join(' ') ] }
160-
for(ws in allWS) {
160+
for (ws in allWS) {
161161
def diff = sh(script: "git diff HEAD ${swtTag} ${sources.src_common} ${sources['src_' + ws]}", returnStdout: true)
162162
if (!diff.trim().isEmpty()) {
163163
NATIVES_CHANGED += ws
@@ -175,7 +175,7 @@ pipeline {
175175
sed -i -e "s/rev=${versions.rev}/rev=${versions.new_rev}/g" \
176176
'bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak'
177177
"""
178-
for(ws in allWS) {
178+
for (ws in allWS) {
179179
if (NATIVES_CHANGED.contains(ws)) {
180180
sh """
181181
# Delete native binaries to be replaced by subsequent binaries build
@@ -239,7 +239,7 @@ pipeline {
239239
script {
240240
def (ws, os, arch) = env.PLATFORM.split('\\.')
241241
dir("jdk-download-${ws}.${arch}") {
242-
// Fetch the JDK, which provides the C header-files and shared native libraries, against which the natives are build.
242+
// Fetch the JDK, which provides the C header files and shared native libraries against which the native code is built.
243243
sh "curl ${getNativeJdkUrl(os, arch)} | tar -xzf - include/ lib/"
244244
stash name:"jdk.resources.${ws}.${arch}", includes: "include/,lib/"
245245
deleteDir()
@@ -382,11 +382,11 @@ pipeline {
382382
sshagent(['github-bot-ssh']) {
383383
dir('eclipse.platform.swt') {
384384
sh """
385-
# Check for the master-branch as late as possible to have as much of the same behaviour as possible
385+
# Check for the master-branch as late as possible to have as much of the same behavior as possible
386386
if [[ '${BRANCH_NAME}' == master ]] || [[ '${BRANCH_NAME}' =~ R[0-9]+_[0-9]+(_[0-9]+)?_maintenance ]]; then
387387
if [[ ${params.skipCommit} != true ]]; then
388388
389-
# Don't rebase and just fail in case another commit has been pushed to the master/maintanance branch in the meantime
389+
# Don't rebase and just fail in case another commit has been pushed to the master/maintenance branch in the meantime
390390
git push origin HEAD:refs/heads/${BRANCH_NAME}
391391
git push origin refs/tags/${getLatestGitTag()}
392392

0 commit comments

Comments
 (0)