andreas-personal/AndysAdguardHomeBlocklistOld
Archived
2
0
Fork 0
Code Issues Pull Requests Activity

JEnkins File merge instead of rebase
Some checks reported errors
andreas-personal/AndysAdguardHomeBlockList/pipeline/head Something is wrong with the build of this commit
Details

Browse Source
This commit is contained in:
Andreas Fahrecker 2024-04-10 05:53:02 +02:00
parent 47e5318560
commit e07d7887bc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile vendored
View File

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