@@ -44,7 +44,7 @@ def runOnNativeBuildAgent(String platform, Closure body) {
44
44
45
45
/* * Returns the download URL of the JDK against whose C headers (in the 'include/' folder) and native libraries the SWT natives are compiled.*/
46
46
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)) {
48
48
// Temporary workaround until there are official Temurin GA releases for Windows on ARM that can be consumed through JustJ
49
49
dir(" ${ WORKSPACE} /repackage-win32.aarch64-jdk" ) {
50
50
sh """
@@ -86,7 +86,7 @@ def Set NATIVES_CHANGED = []
86
86
87
87
pipeline {
88
88
options {
89
- skipDefaultCheckout() // Specialiced checkout is performed below
89
+ skipDefaultCheckout() // Specialized checkout is performed below
90
90
timestamps()
91
91
timeout(time : 180 , unit : ' MINUTES' )
92
92
buildDiscarder(logRotator(numToKeepStr : ' master' . equals(env. BRANCH_NAME ) ? ' 20' : ' 5' , artifactNumToKeepStr: ' master' . equals(env. BRANCH_NAME ) ? ' 3' : ' 1' ))
@@ -117,7 +117,7 @@ pipeline {
117
117
def authorMail = sh(script : ' git log -1 --pretty=format:"%ce" HEAD' , returnStdout : true )
118
118
echo ' HEAD commit author: ' + authorMail
119
119
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.
121
121
currentBuild. result = ' ABORTED'
122
122
error(' Abort build only triggered by automated SWT-natives update.' )
123
123
}
@@ -157,7 +157,7 @@ pipeline {
157
157
'''
158
158
def sourceFoldersProps = readProperties(file : ' nativeSourceFolders.properties' )
159
159
def sources = sourceFoldersProps. collectEntries{ k , src -> [ k, src. split(' ,' ). collect{ f -> ' \' ' + f + ' \' ' }. join(' ' ) ] }
160
- for (ws in allWS) {
160
+ for (ws in allWS) {
161
161
def diff = sh(script : " git diff HEAD ${ swtTag} ${ sources.src_common} ${ sources['src_' + ws]} " , returnStdout : true )
162
162
if (! diff. trim(). isEmpty()) {
163
163
NATIVES_CHANGED + = ws
@@ -175,7 +175,7 @@ pipeline {
175
175
sed -i -e "s/rev=${ versions.rev} /rev=${ versions.new_rev} /g" \
176
176
'bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak'
177
177
"""
178
- for (ws in allWS) {
178
+ for (ws in allWS) {
179
179
if (NATIVES_CHANGED . contains(ws)) {
180
180
sh """
181
181
# Delete native binaries to be replaced by subsequent binaries build
@@ -239,7 +239,7 @@ pipeline {
239
239
script {
240
240
def (ws, os, arch) = env. PLATFORM . split(' \\ .' )
241
241
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 .
243
243
sh " curl ${ getNativeJdkUrl(os, arch)} | tar -xzf - include/ lib/"
244
244
stash name :" jdk.resources.${ ws} .${ arch} " , includes : " include/,lib/"
245
245
deleteDir()
@@ -382,11 +382,11 @@ pipeline {
382
382
sshagent([' github-bot-ssh' ]) {
383
383
dir(' eclipse.platform.swt' ) {
384
384
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
386
386
if [[ '${ BRANCH_NAME} ' == master ]] || [[ '${ BRANCH_NAME} ' =~ R[0-9]+_[0-9]+(_[0-9]+)?_maintenance ]]; then
387
387
if [[ ${ params.skipCommit} != true ]]; then
388
388
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
390
390
git push origin HEAD:refs/heads/${ BRANCH_NAME}
391
391
git push origin refs/tags/${ getLatestGitTag()}
392
392
0 commit comments