Skip to content

Commit e500b01

Browse files
authored
Merge pull request #26 from linuxserver/buildfix
update project repo
2 parents 6042ac5 + 66c8320 commit e500b01

7 files changed

Lines changed: 12 additions & 7 deletions

File tree

.github/workflows/external_trigger.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
3030
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
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
32-
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')
32+
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')
3333
echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY
3434
if grep -q "^orcaslicer_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3535
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
@@ -110,7 +110,7 @@ jobs:
110110
echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
111111
exit 0
112112
else
113-
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')
113+
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')
114114
if grep -q "OrcaSlicer_Linux_AppImage_Ubuntu2404" <<< "${assets}"; then
115115
artifacts_found="true"
116116
else

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ RUN \
4242
libwx-perl && \
4343
echo "**** install orcaslicer from appimage ****" && \
4444
if [ -z ${ORCASLICER_VERSION+x} ]; then \
45-
ORCASLICER_VERSION=$(curl -sX GET "https://api.github.com/repos/SoftFever/OrcaSlicer/releases/latest" \
45+
ORCASLICER_VERSION=$(curl -sX GET "https://api.github.com/repos/OrcaSlicer/OrcaSlicer/releases/latest" \
4646
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
4747
fi && \
48-
RELEASE_URL=$(curl -sX GET "https://api.github.com/repos/SoftFever/OrcaSlicer/releases/latest" | awk '/url/{print $4;exit}' FS='[""]') && \
48+
RELEASE_URL=$(curl -sX GET "https://api.github.com/repos/OrcaSlicer/OrcaSlicer/releases/latest" | awk '/url/{print $4;exit}' FS='[""]') && \
4949
DOWNLOAD_URL=$(curl -sX GET "${RELEASE_URL}" | awk '/browser_download_url.*Ubuntu2404/{print $4;exit}' FS='[""]') && \
5050
cd /tmp && \
5151
curl -o \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pipeline {
1919
DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
2020
QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
2121
GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
22-
EXT_USER = 'SoftFever'
22+
EXT_USER = 'OrcaSlicer'
2323
EXT_REPO = 'OrcaSlicer'
2424
BUILD_VERSION_ARG = 'ORCASLICER_VERSION'
2525
LS_USER = 'linuxserver'

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
566566

567567
## Versions
568568

569+
* **25.11.25:** - Update project repo name.
569570
* **15.09.25:** - Rebase to Ubuntu Noble and Selkies, HTTPS is now required.
570571
* **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon.
571572
* **15.11.23:** - Initial release.

jenkins-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ release_type: stable
77
release_tag: latest
88
ls_branch: master
99
external_artifact_check: |
10-
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')
10+
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')
1111
if grep -q "OrcaSlicer_Linux_AppImage_Ubuntu2404" <<< "${assets}"; then
1212
artifacts_found="true"
1313
else
1414
artifacts_found="false"
1515
fi
1616
repo_vars:
17-
- EXT_USER = 'SoftFever'
17+
- EXT_USER = 'OrcaSlicer'
1818
- EXT_REPO = 'OrcaSlicer'
1919
- BUILD_VERSION_ARG = 'ORCASLICER_VERSION'
2020
- LS_USER = 'linuxserver'

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ init_diagram: |
106106
"orcaslicer:latest" <- Base Images
107107
# changelog
108108
changelogs:
109+
- {date: "25.11.25:", desc: "Update project repo name."}
109110
- {date: "15.09.25:", desc: "Rebase to Ubuntu Noble and Selkies, HTTPS is now required."}
110111
- {date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon."}
111112
- {date: "15.11.23:", desc: "Initial release."}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
sleep infinity

0 commit comments

Comments
 (0)