diff --git a/Jenkinsfile b/Jenkinsfile index 5c272a2..474a9c4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,9 +8,7 @@ node('Palladium'){ currentBuild.result = 'ABORTED' error('Последний коммит - результат сборки jenkins') } - sh "git checkout ${env.BRANCH_NAME}" - - sh "git pull --rebase" + sh "git checkout ${env.BRANCH_NAME}" } stage("build and publish"){ dir('angular'){ diff --git a/Jenkinsfile.~coffee-like-test~ b/Jenkinsfile.~coffee-like-test~ deleted file mode 100644 index 9c1186f..0000000 --- a/Jenkinsfile.~coffee-like-test~ +++ /dev/null @@ -1,30 +0,0 @@ -env.HL_BUILD_MODE = "jenkins" - -node('Palladium'){ - - stage('get new version to repo') { - checkout scm - if (lastCommitIsBumpCommit()) { - currentBuild.result = 'ABORTED' - error('Последний коммит - результат сборки jenkins') - } - - //sh "git submodule update --init --recursive" - //sh "git submodule update --remote --merge" - } - stage("build and publish"){ - dir('angular'){ - sh label: '', script: 'npm i' - sh label: '', script: 'npm run build' - } - } -} - -private boolean lastCommitIsBumpCommit() { - lastCommit = sh([script: 'git log -1', returnStdout: true]) - if (lastCommit.contains("Author: jenkins")) { - return true - } else { - return false - } -}