diff --git a/.cursorignore b/.cursorignore index 5ff5f06f8d..d79104d045 100644 --- a/.cursorignore +++ b/.cursorignore @@ -4,4 +4,7 @@ build_*/ build/ localization/ sandboxes/ -resources/ +resources/* +!resources/web/ +!resources/dailytip +!resources/shaders diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index fcdfad099b..c0990561e1 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -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 diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 68f6553e0a..650ef10bec 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -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: | diff --git a/deps/TIFF/TIFF.cmake b/deps/TIFF/TIFF.cmake index 01d72428b9..9d66d89b8b 100644 --- a/deps/TIFF/TIFF.cmake +++ b/deps/TIFF/TIFF.cmake @@ -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() \ No newline at end of file