Skip to content

Commit bafdb4a

Browse files
authored
Merge branch 'eclipse-platform:master' into master
2 parents 3ee46f8 + f92b752 commit bafdb4a

File tree

72 files changed

+820
-946
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+820
-946
lines changed

Jenkinsfile

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,28 +113,18 @@ pipeline {
113113
steps {
114114
dir('eclipse.platform.swt') {
115115
checkout scm
116-
script {
117-
def authorMail = sh(script: 'git log -1 --pretty=format:"%ce" HEAD', returnStdout: true)
118-
echo 'HEAD commit author: ' + authorMail
119-
def buildBotMail = 'platform-bot@eclipse.org'
120-
if (buildBotMail.equals(authorMail) && !params.forceNativeBuilds) {
121-
// Prevent endless build-loops due to self triggering because of a previous automated build of natives and the associated updates.
122-
currentBuild.result = 'ABORTED'
123-
error('Abort build only triggered by automated SWT-natives update.')
124-
}
125-
sh """
116+
sh '''
126117
java -version
127118
git version
128119
git lfs version
129-
git config --global user.email '${buildBotMail}'
120+
git config --global user.email 'platform-bot@eclipse.org'
130121
git config --global user.name 'Eclipse Platform Bot'
131122
git config --unset core.hooksPath # Jenkins disables hooks by default as security feature, but we need the hooks for LFS
132123
git lfs update # Install Git LFS hooks in repository, which has been skipped due to the initially nulled hookspath
133124
git lfs pull
134125
git fetch --all --tags --quiet
135126
git remote set-url --push origin git@github.com:eclipse-platform/eclipse.platform.swt.git
136-
"""
137-
}
127+
'''
138128
}
139129
}
140130
}

binaries/org.eclipse.swt.cocoa.macosx.aarch64/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx.aarch64; singleton:=true
6-
Bundle-Version: 3.130.100.qualifier
6+
Bundle-Version: 3.131.0.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

binaries/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx.x86_64; singleton:=true
6-
Bundle-Version: 3.130.100.qualifier
6+
Bundle-Version: 3.131.0.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

binaries/org.eclipse.swt.gtk.linux.aarch64/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.aarch64; singleton:=true
6-
Bundle-Version: 3.130.100.qualifier
6+
Bundle-Version: 3.131.0.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

binaries/org.eclipse.swt.gtk.linux.loongarch64/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.loongarch64; singleton:=true
6-
Bundle-Version: 3.130.0.qualifier
6+
Bundle-Version: 3.131.0.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

binaries/org.eclipse.swt.gtk.linux.ppc64le/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true
6-
Bundle-Version: 3.130.100.qualifier
6+
Bundle-Version: 3.131.0.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

binaries/org.eclipse.swt.gtk.linux.riscv64/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.riscv64; singleton:=true
6-
Bundle-Version: 3.130.100.qualifier
6+
Bundle-Version: 3.131.0.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

binaries/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
6-
Bundle-Version: 3.130.100.qualifier
6+
Bundle-Version: 3.131.0.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

binaries/org.eclipse.swt.win32.win32.aarch64/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.win32.win32.aarch64; singleton:=true
6-
Bundle-Version: 3.130.100.qualifier
6+
Bundle-Version: 3.131.0.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

binaries/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.win32.win32.x86_64; singleton:=true
6-
Bundle-Version: 3.130.100.qualifier
6+
Bundle-Version: 3.131.0.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

0 commit comments

Comments
 (0)