Skip to content

[Build] Move tools declaration to common Jenkins pipeline section #975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HannesWell wants to merge 2 commits into from
Closed

[Build] Move tools declaration to common Jenkins pipeline section #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9c101a
[Build] Move tools declaration to common Jenkins pipeline section
HannesWell Jan 13, 2024
b7fd4d0
[TEMP|REMOVE] test natives build and save results
HannesWell Jan 13, 2024
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
15 changes: 7 additions & 8 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ pipeline {
agent {
label 'centos-latest'
}
tools {
jdk 'openjdk-jdk17-latest'
maven 'apache-maven-latest'
}
environment {
MAVEN_OPTS = "-Xmx4G"
PR_VALIDATION_BUILD = "true"
Expand Down Expand Up @@ -277,11 +281,6 @@ pipeline {
}
}
stage('Build') {
tools {
// Define tools only in this stage to not interfere with default environemts of SWT-natives build-agents
jdk 'openjdk-jdk17-latest'
maven 'apache-maven-latest'
}
steps {
xvnc(useXauthority: true) {
dir('eclipse.platform.swt') {
Expand Down Expand Up @@ -317,14 +316,14 @@ pipeline {
echo "newSWTNativesTag: ${newSWTNativesTag}"
sh """
# Check for the master-branch as late as possible to have as much of the same behaviour as possible
if [[ '${BRANCH_NAME}' == master ]] || [[ '${BRANCH_NAME}' =~ R[0-9]+_[0-9]+(_[0-9]+)?_maintenance ]]; then
if [[ '${BRANCH_NAME}' == PR-975 ]] || [[ '${BRANCH_NAME}' =~ R[0-9]+_[0-9]+(_[0-9]+)?_maintenance ]]; then
if [[ ${params.skipCommit} != true ]]; then

#Don't rebase and just fail in case another commit has been pushed to the master/maintanance branch in the meantime

pushd eclipse.platform.swt
git push origin HEAD:refs/heads/${BRANCH_NAME}
git push origin refs/tags/${newSWTNativesTag}
git push -f origin HEAD:refs/heads/test-common-tools
#git push origin refs/tags/${newSWTNativesTag}
popd

exit 0
Expand Down
1 change: 1 addition & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# Contributors:
# IBM Corporation - initial API and implementation
#*******************************************************************************
# Dummy change

maj_ver=4
min_ver=964
Expand Down