diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 9edddc9..6c56a20 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -29,7 +29,7 @@ jobs: echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY echo "> External trigger running off of master branch. To disable this trigger, add \`orcaslicer_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY - EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/SoftFever/OrcaSlicer/releases/latest" | jq -r '. | .tag_name') + EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/OrcaSlicer/OrcaSlicer/releases/latest" | jq -r '. | .tag_name') echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY if grep -q "^orcaslicer_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY @@ -110,7 +110,7 @@ jobs: echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 else - assets=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/SoftFever/OrcaSlicer/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url') + assets=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/OrcaSlicer/OrcaSlicer/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url') if grep -q "OrcaSlicer_Linux_AppImage_Ubuntu2404" <<< "${assets}"; then artifacts_found="true" else diff --git a/Dockerfile b/Dockerfile index b4c434a..5a47710 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,10 +42,10 @@ RUN \ libwx-perl && \ echo "**** install orcaslicer from appimage ****" && \ if [ -z ${ORCASLICER_VERSION+x} ]; then \ - ORCASLICER_VERSION=$(curl -sX GET "https://api.github.com/repos/SoftFever/OrcaSlicer/releases/latest" \ + ORCASLICER_VERSION=$(curl -sX GET "https://api.github.com/repos/OrcaSlicer/OrcaSlicer/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ - RELEASE_URL=$(curl -sX GET "https://api.github.com/repos/SoftFever/OrcaSlicer/releases/latest" | awk '/url/{print $4;exit}' FS='[""]') && \ + RELEASE_URL=$(curl -sX GET "https://api.github.com/repos/OrcaSlicer/OrcaSlicer/releases/latest" | awk '/url/{print $4;exit}' FS='[""]') && \ DOWNLOAD_URL=$(curl -sX GET "${RELEASE_URL}" | awk '/browser_download_url.*Ubuntu2404/{print $4;exit}' FS='[""]') && \ cd /tmp && \ curl -o \ diff --git a/Jenkinsfile b/Jenkinsfile index b4a5f55..46c71bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') QUAYIO_API_TOKEN=credentials('quayio-repo-api-token') GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f') - EXT_USER = 'SoftFever' + EXT_USER = 'OrcaSlicer' EXT_REPO = 'OrcaSlicer' BUILD_VERSION_ARG = 'ORCASLICER_VERSION' LS_USER = 'linuxserver' diff --git a/README.md b/README.md index b941a66..b4836b1 100644 --- a/README.md +++ b/README.md @@ -566,6 +566,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **25.11.25:** - Update project repo name. * **15.09.25:** - Rebase to Ubuntu Noble and Selkies, HTTPS is now required. * **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon. * **15.11.23:** - Initial release. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 0d8f4d4..2c95c58 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -7,14 +7,14 @@ release_type: stable release_tag: latest ls_branch: master external_artifact_check: | - assets=$(curl -u "${{ '{{' }} secrets.CR_USER {{ '}}' }}:${{ '{{' }} secrets.CR_PAT {{ '}}' }}" -sX GET "https://api.github.com/repos/SoftFever/OrcaSlicer/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url') + assets=$(curl -u "${{ '{{' }} secrets.CR_USER {{ '}}' }}:${{ '{{' }} secrets.CR_PAT {{ '}}' }}" -sX GET "https://api.github.com/repos/OrcaSlicer/OrcaSlicer/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url') if grep -q "OrcaSlicer_Linux_AppImage_Ubuntu2404" <<< "${assets}"; then artifacts_found="true" else artifacts_found="false" fi repo_vars: - - EXT_USER = 'SoftFever' + - EXT_USER = 'OrcaSlicer' - EXT_REPO = 'OrcaSlicer' - BUILD_VERSION_ARG = 'ORCASLICER_VERSION' - LS_USER = 'linuxserver' diff --git a/readme-vars.yml b/readme-vars.yml index 2be449c..3362eaf 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -106,6 +106,7 @@ init_diagram: | "orcaslicer:latest" <- Base Images # changelog changelogs: + - {date: "25.11.25:", desc: "Update project repo name."} - {date: "15.09.25:", desc: "Rebase to Ubuntu Noble and Selkies, HTTPS is now required."} - {date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon."} - {date: "15.11.23:", desc: "Initial release."} diff --git a/root/etc/s6-overlay/s6-rc.d/svc-dbus/run b/root/etc/s6-overlay/s6-rc.d/svc-dbus/run new file mode 100755 index 0000000..701c8e0 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-dbus/run @@ -0,0 +1,3 @@ +#!/usr/bin/with-contenv bash + +sleep infinity