mirror of
https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git
synced 2025-06-03 10:54:29 +08:00
reenable appimage build on ubuntu 24.04 (#9458)
* reenable appimage build on ubuntu 24.04 * update TIFF * fix build error
This commit is contained in:
parent
e2b16f527a
commit
54a5ac9235
@ -4,4 +4,7 @@ build_*/
|
||||
build/
|
||||
localization/
|
||||
sandboxes/
|
||||
resources/
|
||||
resources/*
|
||||
!resources/web/
|
||||
!resources/dailytip
|
||||
!resources/shaders
|
||||
|
4
.github/workflows/build_all.yml
vendored
4
.github/workflows/build_all.yml
vendored
@ -49,9 +49,9 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
# Deprecate appimage
|
||||
# Deprecate 20.04appimage
|
||||
# - os: ubuntu-20.04
|
||||
# - os: ubuntu-24.04
|
||||
- os: ubuntu-24.04
|
||||
- os: windows-latest
|
||||
- os: macos-14
|
||||
arch: arm64
|
||||
|
2
.github/workflows/build_orca.yml
vendored
2
.github/workflows/build_orca.yml
vendored
@ -267,7 +267,7 @@ jobs:
|
||||
chmod +x ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ 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-24.04'
|
||||
working-directory: ${{ github.workspace }}/build/src
|
||||
shell: bash
|
||||
run: |
|
||||
|
7
deps/TIFF/TIFF.cmake
vendored
7
deps/TIFF/TIFF.cmake
vendored
@ -17,7 +17,7 @@ if (APPLE)
|
||||
else()
|
||||
orcaslicer_add_cmake_project(TIFF
|
||||
URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip
|
||||
URL_HASH SHA256=c56edfacef0a60c0de3e6489194fcb2f24c03dbb550a8a7de5938642d045bd32
|
||||
URL_HASH SHA256=17a3e875acece9be40b093361cfef47385d4ef22c995ffbf36b2871f5785f9b8
|
||||
DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
|
||||
CMAKE_ARGS
|
||||
-Dlzma:BOOL=OFF
|
||||
@ -27,7 +27,4 @@ else()
|
||||
-Dpixarlog:BOOL=OFF
|
||||
)
|
||||
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
endif()
|
Loading…
x
Reference in New Issue
Block a user