Jenkins Maybe Fix Git Error
Some checks failed
andreas-personal/AndysAdguardHomeBlockList/pipeline/head There was a failure building this commit
Some checks failed
andreas-personal/AndysAdguardHomeBlockList/pipeline/head There was a failure building this commit
This commit is contained in:
parent
a16f1bc3e1
commit
189bf4f373
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -24,6 +24,7 @@ pipeline {
|
|||||||
git checkout main
|
git checkout main
|
||||||
mkdir -p dist
|
mkdir -p dist
|
||||||
npm run compile
|
npm run compile
|
||||||
|
git stash
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -37,9 +38,10 @@ pipeline {
|
|||||||
gitUsernamePassword(credentialsId: 'gitea-jenkins-user-token')
|
gitUsernamePassword(credentialsId: 'gitea-jenkins-user-token')
|
||||||
]) {
|
]) {
|
||||||
sh '''
|
sh '''
|
||||||
|
git pull --rebase
|
||||||
|
git stash pop || true
|
||||||
git add .
|
git add .
|
||||||
git commit -m "Update Compiled Adblock List"
|
git commit -m "Update Compiled Adblock List"
|
||||||
git pull --rebase
|
|
||||||
git push
|
git push
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user