diff --git a/Jenkinsfile b/Jenkinsfile index 843d37f..be41d49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,6 +24,7 @@ pipeline { git checkout main mkdir -p dist npm run compile + git stash ''' } } @@ -37,9 +38,10 @@ pipeline { gitUsernamePassword(credentialsId: 'gitea-jenkins-user-token') ]) { sh ''' + git pull --rebase + git stash pop || true git add . git commit -m "Update Compiled Adblock List" - git pull --rebase git push ''' }