Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/external_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
echo "> External trigger running off of master branch. To disable this trigger, add \`bambustudio_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/bambulab/BambuStudio/releases/latest" | jq -r '. | .tag_name')
echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/bambulab/BambuStudio/releases" | jq -r '.[0] | .tag_name')
echo "Type is \`github_devel\`" >> $GITHUB_STEP_SUMMARY
if grep -q "^bambustudio_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
exit 0
else
assets=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/bambulab/BambuStudio/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url')
if grep -q "Bambu_Studio_ubuntu-24.04" <<< "${assets}"; then
if grep -q "BambuStudio_ubuntu-24.04" <<< "${assets}"; then
artifacts_found="true"
else
artifacts_found="false"
Expand Down
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ LABEL maintainer="thelamer"

# title
ENV TITLE=BambuStudio \
SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \
NO_GAMEPAD=true \
PIXELFLUX_WAYLAND=true

RUN \
echo "**** add icon ****" && \
Expand All @@ -35,12 +37,10 @@ RUN \
libwebkit2gtk-4.1-0 \
libwx-perl && \
echo "**** install bambu studio from appimage ****" && \
if [ -z ${BAMBUSTUDIO_VERSION+x} ]; then \
BAMBUSTUDIO_VERSION=$(curl -sX GET "https://api.github.com/repos/bambulab/BambuStudio/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
RELEASE_URL=$(curl -sX GET "https://api.github.com/repos/bambulab/BambuStudio/releases/latest" | awk '/url/{print $4;exit}' FS='[""]') && \
DOWNLOAD_URL=$(curl -sX GET "${RELEASE_URL}" | awk '/browser_download_url.*ubuntu-24.04/{print $4;exit}' FS='[""]') && \
RELEASE_URL=$(curl -sX GET "https://api.github.com/repos/bambulab/BambuStudio/releases" \
| awk '/url/{print $4;exit}' FS='[""]') && \
DOWNLOAD_URL=$(curl -sX GET "${RELEASE_URL}" \
| awk '/browser_download_url.*ubuntu-24.04/{print $4;exit}' FS='[""]') && \
cd /tmp && \
curl -o \
/tmp/bambu.app -L \
Expand Down
30 changes: 15 additions & 15 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -145,23 +145,23 @@ pipeline {
/* ########################
External Release Tagging
######################## */
// If this is a stable github release use the latest endpoint from github to determine the ext tag
stage("Set ENV github_stable"){
steps{
script{
env.EXT_RELEASE = sh(
script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''',
returnStdout: true).trim()
}
}
// If this is a devel github release use the first in an array from github to determine the ext tag
stage("Set ENV github_devel"){
steps{
script{
env.EXT_RELEASE = sh(
script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq -r '.[0] | .tag_name' ''',
returnStdout: true).trim()
}
}
}
// If this is a stable or devel github release generate the link for the build message
stage("Set ENV github_link"){
steps{
script{
env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
}
}
steps{
script{
env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
}
}
}
// Sanitize the release tag and strip illegal docker or github characters
stage("Sanitize tag"){
Expand Down Expand Up @@ -1031,7 +1031,7 @@ pipeline {
"type": "commit",\
"tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
echo "Pushing New release for Tag"
curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. |.body' > releasebody.json
curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq -r '.[0] |.body' > releasebody.json
jq -n \
--arg tag_name "$META_TAG" \
--arg target_commitish "master" \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **11.04.26:** - Ingest from pre-release, make Wayland default disable with PIXELFLUX_WAYLAND=false.
* **28.12.25:** - Add Wayland init logic.
* **31.08.25:** - Update AppImage ingestion.
* **14.08.25:** - Rebase to Ubuntu Noble to ingest approved appimage.
Expand Down
4 changes: 2 additions & 2 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

# jenkins variables
project_name: docker-bambustudio
external_type: github_stable
external_type: github_devel
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/bambulab/BambuStudio/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url')
if grep -q "Bambu_Studio_ubuntu-24.04" <<< "${assets}"; then
if grep -q "BambuStudio_ubuntu-24.04" <<< "${assets}"; then
artifacts_found="true"
else
artifacts_found="false"
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ init_diagram: |
"bambustudio:latest" <- Base Images
# changelog
changelogs:
- {date: "11.04.26:", desc: "Ingest from pre-release, make Wayland default disable with PIXELFLUX_WAYLAND=false."}
- {date: "28.12.25:", desc: "Add Wayland init logic."}
- {date: "31.08.25:", desc: "Update AppImage ingestion."}
- {date: "14.08.25:", desc: "Rebase to Ubuntu Noble to ingest approved appimage."}
Expand Down