@@ -521,23 +521,36 @@ pipeline {
521521 else
522522 echo "No templates to delete"
523523 fi
524- echo "Starting Stage 3 - Update templates"
525524{% if full_custom_readme is not defined and (init_diagram is not defined or init_diagram ) %}
526- if ! grep -q 'init_diagram:' ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml; then
525+ echo "Starting Stage 2.5 - Update init diagram"
526+ if ! grep -q 'init_diagram:' readme-vars.yml; then
527527 echo "Adding the key 'init_diagram' to readme-vars.yml"
528- sed -i '\\|^#.*changelog.*$|d' ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml
529- sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml
530- cp ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml
528+ sed -i '\\|^#.*changelog.*$|d' readme-vars.yml
529+ sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml
531530 fi
532- docker run -d --rm -v /tmp/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:{{ ls_branch }}
533- yq -ei '.init_diagram |= load_str("/tmp/d2/${CONTAINER_NAME}-{{ ls_branch }}.d2")' ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml
534- if [[ $(grep -hs ^ ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | md5sum | cut -c1-8) != $(grep -hs ^ ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml | md5sum | cut -c1-8) ]]; then
535- echo "'init_diagram' has been updated. Re-running jenkins builder."
536- docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) {% if project_repo_name != "docker-jenkins-builder" %} ghcr.io/linuxserver/jenkins-builder:latest{% else %} jenkinslocal:${COMMIT_SHA}-${BUILD_NUMBER}{% endif %} {{ ' ' }}
537- cp ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml
531+ docker run -d --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:{{ ls_branch }}
532+ yq -ei '.init_diagram |= load_str("${TEMPDIR}/d2/${CONTAINER_NAME}-{{ ls_branch }}.d2")' readme-vars.yml || :
533+ if [[ $(grep -hs ^ readme-vars.yml | md5sum | cut -c1-8) != $(grep -hs ^ ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | md5sum | cut -c1-8) ]]; then
534+ echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit."
535+ mkdir -p ${TEMPDIR}/repo
536+ git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
537+ cd ${TEMPDIR}/repo/${LS_REPO}
538+ git checkout -f {{ ls_branch }}
539+ cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml
540+ git add readme-vars.yml
541+ git commit -m 'Bot Updating Templated Files'
542+ git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git {{ ls_branch }}
543+ git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git {{ ls_branch }}
544+ echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
545+ echo "Updating templates and exiting build, new one will trigger based on commit"
546+ rm -Rf ${TEMPDIR}
547+ exit 0
548+ else
549+ echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
550+ echo "Init diagram is unchanged"
538551 fi
539- rm -rf /tmp/d2
540552{% endif %}
553+ echo "Starting Stage 3 - Update templates"
541554 CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
542555 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
543556 NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
0 commit comments