diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index e53485d8c..62889887b 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -43,7 +43,7 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 - os: ubuntu-24.04 - os: windows-latest - os: macos-13 diff --git a/.github/workflows/build_bambu.yml b/.github/workflows/build_bambu.yml index 77b184989..b06aeddb5 100644 --- a/.github/workflows/build_bambu.yml +++ b/.github/workflows/build_bambu.yml @@ -226,24 +226,24 @@ jobs: # Ubuntu - name: Install dependencies from BuildLinux.sh - if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' + if: inputs.os == 'ubuntu-22.04' || inputs.os == 'ubuntu-24.04' shell: bash run: sudo ./BuildLinux.sh -ur - name: Fix permissions - if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' + if: inputs.os == 'ubuntu-22.04' || inputs.os == 'ubuntu-24.04' shell: bash run: sudo chown $USER -R ./ - name: Build slicer - if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' + if: inputs.os == 'ubuntu-22.04' || inputs.os == 'ubuntu-24.04' shell: bash run: | ./BuildLinux.sh -isfr mv -n ./build/BambuStudio_ubu64.AppImage ./build/Bambu_Studio_${{inputs.os}}_${{ env.ver }}.AppImage # - name: Build orca_custom_preset_tests - # if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' + # if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-22.04' # working-directory: ${{ github.workspace }}/build/src # shell: bash # run: | @@ -252,14 +252,14 @@ jobs: # zip -r orca_custom_preset_tests.zip user/ - name: Upload artifacts Ubuntu - if: ${{ ! env.ACT && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }} + if: ${{ ! env.ACT && (inputs.os == 'ubuntu-22.04' || inputs.os == 'ubuntu-24.04') }} uses: actions/upload-artifact@v4 with: name: BambuStudio_${{inputs.os}}_${{ env.ver }} path: './build/Bambu_Studio_${{inputs.os}}_${{ env.ver }}.AppImage' # - name: Deploy Ubuntu release - # if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' }} + # if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-22.04' }} # uses: WebFreak001/deploy-nightly@v3.1.0 # with: # upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} @@ -270,7 +270,7 @@ jobs: # max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted # - name: Deploy orca_custom_preset_tests - # if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' }} + # if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-22.04' }} # uses: WebFreak001/deploy-nightly@v3.1.0 # with: # upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 9b04fb66b..ba998ccf3 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -103,7 +103,7 @@ jobs: - name: Build on Ubuntu - if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' + if: inputs.os == 'ubuntu-22.04' || inputs.os == 'ubuntu-24.04' working-directory: ${{ github.workspace }} run: | sudo ./BuildLinux.sh -ur @@ -129,7 +129,7 @@ jobs: path: ${{ github.workspace }}/deps/build/BambuStudio_dep*.zip - name: Upload Ubuntu artifacts - if: ${{ ! env.ACT && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }} + if: ${{ ! env.ACT && (inputs.os == 'ubuntu-22.04' || inputs.os == 'ubuntu-24.04') }} uses: actions/upload-artifact@v4 with: name: BambuStudio_dep_${{ inputs.os }}_${{ env.date }} diff --git a/deps/TIFF/TIFF.cmake b/deps/TIFF/TIFF.cmake index 93b3fcfc5..19bef192f 100644 --- a/deps/TIFF/TIFF.cmake +++ b/deps/TIFF/TIFF.cmake @@ -1,8 +1,8 @@ find_package(OpenGL QUIET REQUIRED) bambustudio_add_cmake_project(TIFF - URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip - URL_HASH SHA256=c56edfacef0a60c0de3e6489194fcb2f24c03dbb550a8a7de5938642d045bd32 + URL https://download.osgeo.org/libtiff/tiff-4.1.0.zip + URL_HASH SHA256=6F3DBED9D2ECFED33C7192B5C01884078970657FA21B4AD28E3CDF3438EB2419 DEPENDS ${ZLIB_PKG} ${PNG_PKG} ${JPEG_PKG} CMAKE_ARGS -Dlzma:BOOL=OFF