diff --git a/Dockerfile b/Dockerfile index 7b6edd5..720d3e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,8 +33,7 @@ RUN \ gstreamer1.0-pulseaudio \ libosmesa6 \ libwebkit2gtk-4.1-0 \ - libwx-perl \ - unzip && \ + 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" \ @@ -44,12 +43,8 @@ RUN \ DOWNLOAD_URL=$(curl -sX GET "${RELEASE_URL}" | awk '/browser_download_url.*ubuntu-24.04/{print $4;exit}' FS='[""]') && \ cd /tmp && \ curl -o \ - /tmp/bambu.zip -L \ + /tmp/bambu.app -L \ "${DOWNLOAD_URL}" && \ - unzip bambu.zip && \ - mv \ - *.AppImage \ - bambu.app && \ chmod +x /tmp/bambu.app && \ ./bambu.app --appimage-extract && \ mv squashfs-root /opt/bambustudio && \ diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 0419d5e..aba2e36 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -8,7 +8,7 @@ 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 "BambuStudio_ubuntu-24.04" <<< "${assets}"; then + if grep -q "Bambu_Studio_ubuntu-24.04" <<< "${assets}"; then artifacts_found="true" else artifacts_found="false"