mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:github workflow fix 

jira: nojia
Change-Id: Ifa79d713cb09ca927797160c7fbb53f266501f84
(cherry picked from commit b059336940dd038b30e1cf0a44ebcd33df771a8c)
This commit is contained in:
Mack 2025-04-24 20:28:51 +08:00 committed by Lane.Wei
parent c9f4cbc94b
commit dc041c1321
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_all.yml vendored
View File

@ -43,7 +43,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- os: ubuntu-20.04 - os: ubuntu-22.04
- os: ubuntu-24.04 - os: ubuntu-24.04
- os: windows-latest - os: windows-latest
- os: macos-13 - os: macos-13

14
.github/workflows/build_bambu.yml vendored
View File

@ -226,24 +226,24 @@ jobs:
# Ubuntu # Ubuntu
- name: Install dependencies from BuildLinux.sh - 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 shell: bash
run: sudo ./BuildLinux.sh -ur run: sudo ./BuildLinux.sh -ur
- name: Fix permissions - 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 shell: bash
run: sudo chown $USER -R ./ run: sudo chown $USER -R ./
- name: Build slicer - 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 shell: bash
run: | run: |
./BuildLinux.sh -isfr ./BuildLinux.sh -isfr
mv -n ./build/BambuStudio_ubu64.AppImage ./build/Bambu_Studio_${{inputs.os}}_${{ env.ver }}.AppImage mv -n ./build/BambuStudio_ubu64.AppImage ./build/Bambu_Studio_${{inputs.os}}_${{ env.ver }}.AppImage
# - name: Build orca_custom_preset_tests # - 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 # working-directory: ${{ github.workspace }}/build/src
# shell: bash # shell: bash
# run: | # run: |
@ -252,14 +252,14 @@ jobs:
# zip -r orca_custom_preset_tests.zip user/ # zip -r orca_custom_preset_tests.zip user/
- name: Upload artifacts Ubuntu - 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 uses: actions/upload-artifact@v4
with: with:
name: BambuStudio_${{inputs.os}}_${{ env.ver }} name: BambuStudio_${{inputs.os}}_${{ env.ver }}
path: './build/Bambu_Studio_${{inputs.os}}_${{ env.ver }}.AppImage' path: './build/Bambu_Studio_${{inputs.os}}_${{ env.ver }}.AppImage'
# - name: Deploy Ubuntu release # - 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 # uses: WebFreak001/deploy-nightly@v3.1.0
# with: # with:
# upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} # 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 # 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 # - 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 # uses: WebFreak001/deploy-nightly@v3.1.0
# with: # with:
# upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} # upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}

4
.github/workflows/build_deps.yml vendored
View File

@ -103,7 +103,7 @@ jobs:
- name: Build on Ubuntu - 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 }} working-directory: ${{ github.workspace }}
run: | run: |
sudo ./BuildLinux.sh -ur sudo ./BuildLinux.sh -ur
@ -129,7 +129,7 @@ jobs:
path: ${{ github.workspace }}/deps/build/BambuStudio_dep*.zip path: ${{ github.workspace }}/deps/build/BambuStudio_dep*.zip
- name: Upload Ubuntu artifacts - 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 uses: actions/upload-artifact@v4
with: with:
name: BambuStudio_dep_${{ inputs.os }}_${{ env.date }} name: BambuStudio_dep_${{ inputs.os }}_${{ env.date }}

4
deps/TIFF/TIFF.cmake vendored
View File

@ -1,8 +1,8 @@
find_package(OpenGL QUIET REQUIRED) find_package(OpenGL QUIET REQUIRED)
bambustudio_add_cmake_project(TIFF bambustudio_add_cmake_project(TIFF
URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip URL https://download.osgeo.org/libtiff/tiff-4.1.0.zip
URL_HASH SHA256=c56edfacef0a60c0de3e6489194fcb2f24c03dbb550a8a7de5938642d045bd32 URL_HASH SHA256=6F3DBED9D2ECFED33C7192B5C01884078970657FA21B4AD28E3CDF3438EB2419
DEPENDS ${ZLIB_PKG} ${PNG_PKG} ${JPEG_PKG} DEPENDS ${ZLIB_PKG} ${PNG_PKG} ${JPEG_PKG}
CMAKE_ARGS CMAKE_ARGS
-Dlzma:BOOL=OFF -Dlzma:BOOL=OFF