diff --git a/Jenkinsfile b/Jenkinsfile index 49b1992..92a6611 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,7 @@ pipeline { } steps { sh ''' - git checkout main + git checkout -b build-${BUILD_NUMBER} mkdir -p dist npm run compile git stash @@ -38,11 +38,9 @@ pipeline { gitUsernamePassword(credentialsId: 'gitea-jenkins-user-token') ]) { sh ''' - git rebase --abort || true + git checkout main git pull --rebase - git stash pop || true - git add . - git commit -m "Update Compiled Adblock List" + git merge build-${BUILD_NUMBER} --no-ff -m "Merge build ${BUILD_NUMBER}" git push ''' }