confdroid/confdroid_jenkins
1
0
Fork 0
Code Issues Projects Wiki Activity

Merge build 5 into master

Browse Source
This commit is contained in:
Jenkins Server
2026-04-16 16:10:07 +02:00
parent 06f863f4f5 8074aebbf7
commit 51aeb2c28b
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.vscode/settings.json vendored
View File

@@ -1,13 +0,0 @@
{
"cSpell.words": [
"descr",
"dport",
"fontconfig",
"gpgcheck",
"NOPASSWD",
"repodata",
"repomd",
"requiretty",
"yumrepo"
]
}

14
Jenkinsfile vendored
View File

@@ -96,6 +96,7 @@ pipeline {
sh ''' sh '''
git config user.name "Jenkins Server" git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com git config user.email jenkins@confdroid.com
git rm -r --cached .vscode || echo "No .vscode to remove from git"
git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit" git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
git fetch origin git fetch origin
git checkout -B master origin/master git checkout -B master origin/master
@@ -114,13 +115,20 @@ pipeline {
script { script {
sh ''' sh '''
git fetch origin git fetch origin
git checkout master git checkout -B gitea-mirror-$BUILD_NUMBER origin/master
git reset --hard origin/master git rm -f Jenkinsfile
git commit -m "Remove Jenkinsfile for Gitea mirror" || echo "No changes to commit"
git remote get-url master >/dev/null 2>&1 \ git remote get-url master >/dev/null 2>&1 \
&& git remote set-url master https://sourcecode.confdroid.com/confdroid/confdroid_jenkins.git \ && git remote set-url master https://sourcecode.confdroid.com/confdroid/confdroid_jenkins.git \
|| git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_jenkins.git || git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_jenkins.git
git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \ git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
push --force master refs/heads/master:refs/heads/master push --force master HEAD:refs/heads/master
git ls-remote --heads master | awk '{print $2}' | sed 's#refs/heads/##' | while read branch; do
if [ -n "$branch" ] && [ "$branch" != "master" ]; then
git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
push master --delete "$branch"
fi
done
''' '''
} }
} }