diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000..d448dea387 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +#[lfs] +# url = https://lfs.github.com/eclipse-platform/eclipse.platform.swt diff --git a/Jenkinsfile b/Jenkinsfile index 00d0600162..a8b33b71a0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,7 +74,16 @@ pipeline { } stages { stage('Checkout swt git repos') { +// environment { +// PATH = "${WORKSPACE}/tools/git-lfs:${env.PATH}" // Add git-lfs (installed subsequently) to PATH explicitly until it is available by default +// } steps { +// dir('tools') { // download git-lfs until it is available by default +// sh ''' +// curl -L https://github.com/git-lfs/git-lfs/releases/download/v3.4.1/git-lfs-linux-amd64-v3.4.1.tar.gz | tar -xzf - +// mv git-lfs-* git-lfs +// ''' +// } dir('eclipse.platform.swt') { checkout scm script { @@ -320,15 +329,15 @@ 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-956' ]] || [[ '${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 config --unset core.hooksPath - git push origin HEAD:refs/heads/${BRANCH_NAME} - git push origin refs/tags/${newSWTNativesTag} + git push -f origin HEAD:refs/heads/test-lfs-pushing + #git push origin refs/tags/${newSWTNativesTag} popd exit 0