From 6b79ed1b50401e1d50ea487968aa513e4ff513fe Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Thu, 16 Apr 2026 15:59:41 +0200 Subject: [PATCH 1/4] OP#581 remove .vscode in jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 9f2822d..aa89154 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { sh ''' git config user.name "Jenkins Server" 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 fetch origin git checkout -B master origin/master From 002172003ae9258ef84feb14f34141e5c66b6e50 Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Thu, 16 Apr 2026 16:07:54 +0200 Subject: [PATCH 2/4] OP#581 edit jenkinsfile so the mirror only receives relevant files --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index aa89154..cb9af2d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -115,13 +115,14 @@ pipeline { script { sh ''' git fetch origin - git checkout master - git reset --hard origin/master + git checkout -B gitea-mirror-$BUILD_NUMBER 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 set-url 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" \ - push --force master refs/heads/master:refs/heads/master + push --force master HEAD:refs/heads/master ''' } } From 96abe7bd38c314b7d83b1cbcac34ecf03c6d7657 Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Thu, 16 Apr 2026 16:08:48 +0200 Subject: [PATCH 3/4] OP#581 edit jenkinsfile so the mirror only receives relevant files --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index cb9af2d..a8cdc29 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -123,6 +123,12 @@ pipeline { || 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" \ 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 ''' } } From 8074aebbf7b907393976f56de510f603f7448f4c Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 16 Apr 2026 16:10:06 +0200 Subject: [PATCH 4/4] Recommit for updates in build 5 --- .vscode/settings.json | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 89b1287..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "cSpell.words": [ - "descr", - "dport", - "fontconfig", - "gpgcheck", - "NOPASSWD", - "repodata", - "repomd", - "requiretty", - "yumrepo" - ] -} \ No newline at end of file