diff --git a/deploy-this/update-from-git.jenkinsfile b/deploy-this/update-from-git.jenkinsfile index 222c3f1..dbb3033 100755 --- a/deploy-this/update-from-git.jenkinsfile +++ b/deploy-this/update-from-git.jenkinsfile @@ -8,21 +8,22 @@ def projects = [ ] def git_take(projects, git_remote) { - withCredentials([usernamePassword(credentialsId: 'c3c1f5bf-8f6e-4686-b26c-3f419ef7973e', usernameVariable: 'GIT_USER', passwordVariable: 'GIT_PASS')]) { + withCredentials([usernamePassword(credentialsId: 'gitea-creds', usernameVariable: 'GIT_USER', passwordVariable: 'GIT_PASS')]) { projects.each { project -> if (fileExists(project)) { dir(project) { - sh """ + sh ''' echo "=== Updating ${project} ===" + git remote set-url origin https://${GIT_USER}:${GIT_PASS}@git.arti24.eu/gitea/${project}.git git fetch origin git reset --hard origin/main - """ + ''' } } else { - sh ''' - git clone https://${GIT_USER}:${GIT_PASS}@git.arti24.eu/gitea/project.git - ''' - + sh ''' + echo "=== Cloning ${project} ===" + git clone https://${GIT_USER}:${GIT_PASS}@git.arti24.eu/gitea/${project}.git + ''' } dir(project) { sh "git --no-pager log -n 1 --pretty=format:'%h %ad %s' --date=short" @@ -31,6 +32,7 @@ def git_take(projects, git_remote) { } } + def disableSafeDirCheck() { sh "git config --global --add safe.directory '*'" }