From e4d902220db29680ef7b0876976702aa64139c12 Mon Sep 17 00:00:00 2001 From: xiaoyeliu Date: Mon, 17 Nov 2025 11:52:21 +0800 Subject: [PATCH] Fix: CICD --- .github/workflows/build_all.yml | 2 +- CLAUDE.md | 4 +- build_linux.sh | 10 ++-- ...thub.Snapamker.Snapmaker_Orca.metainfo.xml | 48 ------------------- .../io.github.Snapmaker.Snapmaker_Orca.yml | 6 +-- src/CMakeLists.txt | 4 +- 6 files changed, 13 insertions(+), 61 deletions(-) delete mode 100644 scripts/flatpak/io.github.Snapamker.Snapmaker_Orca.metainfo.xml diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index c516194cb8..3b7b48d3a2 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -70,7 +70,7 @@ jobs: flatpak: name: "Flatpak" container: - image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-47 + image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48 options: --privileged volumes: - /usr/local/lib/android:/usr/local/lib/android diff --git a/CLAUDE.md b/CLAUDE.md index bec75bea8e..d7fa733073 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -4,7 +4,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co ## Overview -OrcaSlicer is an open-source 3D slicer application forked from Bambu Studio, built using C++ with wxWidgets for the GUI and CMake as the build system. The project uses a modular architecture with separate libraries for core slicing functionality, GUI components, and platform-specific code. +Snapmaker_Orca is an open-source 3D slicer application forked from Bambu Studio, built using C++ with wxWidgets for the GUI and CMake as the build system. The project uses a modular architecture with separate libraries for core slicing functionality, GUI components, and platform-specific code. ## Build Commands @@ -240,7 +240,7 @@ Run individual test suites: ### Codebase Navigation - Use search tools extensively - codebase has 500k+ lines -- Key entry points: `src/OrcaSlicer.cpp` for application startup +- Key entry points: `src/Snapmaker_Orca.cpp` for application startup - Core slicing: `libslic3r/Print.cpp` orchestrates the slicing pipeline - Configuration: `PrintConfig.cpp` defines all print/printer/material settings diff --git a/build_linux.sh b/build_linux.sh index 7058796bcc..56e865a0dd 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -209,7 +209,7 @@ if [[ -n "${BUILD_DEPS}" ]] ; then fi if [[ -n "${BUILD_ORCA}" ]] ; then - echo "Configuring OrcaSlicer..." + echo "Configuring Snapmaker_Orca..." if [[ -n "${CLEAN_BUILD}" ]] ; then rm -fr build fi @@ -229,7 +229,7 @@ if [[ -n "${BUILD_ORCA}" ]] ; then BUILD_ARGS+=(-DORCA_UPDATER_SIG_KEY="${ORCA_UPDATER_SIG_KEY}") fi - echo "Configuring OrcaSlicer..." + echo "Configuring Snapmaker_Orca..." set -x cmake -S . -B build "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" -G "Ninja Multi-Config" \ -DSLIC3R_PCH="${SLIC3R_PRECOMPILED_HEADERS}" \ @@ -240,11 +240,11 @@ if [[ -n "${BUILD_ORCA}" ]] ; then "${BUILD_ARGS[@]}" set +x echo "done" - echo "Building OrcaSlicer ..." + echo "Building Snapmaker_Orca ..." if [[ -n "${BUILD_DEBUG}" ]] ; then - cmake --build build --config Debug --target OrcaSlicer + cmake --build build --config Debug --target Snapmaker_Orca else - cmake --build build --config Release --target OrcaSlicer + cmake --build build --config Release --target Snapmaker_Orca fi echo "Building Snapmaker_Orca_profile_validator .." if [[ -n "${BUILD_DEBUG}" ]] ; then diff --git a/scripts/flatpak/io.github.Snapamker.Snapmaker_Orca.metainfo.xml b/scripts/flatpak/io.github.Snapamker.Snapmaker_Orca.metainfo.xml deleted file mode 100644 index 92938e193f..0000000000 --- a/scripts/flatpak/io.github.Snapamker.Snapmaker_Orca.metainfo.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - io.github.softfever.Snapmaker_Orca - io.github.Snapmaker.Snapmaker_Orca.desktop - - io.github.Snapmaker.Snapmaker_Orca.desktop - - Snapmaker_Orca - - Get even more perfect prints! - SoftFever - https://github.com/Snapmaker/OrcaSlicer - https://github.com/SoftFever/OrcaSlicer/wiki - https://github.com/Snapamker/OrcaSlicer/issues/ - https://ko-fi.com/SoftFever - 0BSD - AGPL-3.0-only - - - 768 - - - keyboard - pointing - - - - https://raw.githubusercontent.com/powpingdone/com.github.softfever.orcaslicer/master/images/1.png - A model ready to be sliced on a buildplate. - - - https://raw.githubusercontent.com/powpingdone/com.github.softfever.orcaslicer/master/images/2.png - - A calibration test ready to be printed out. - - - -

A powerful, free and open-source 3D printer slicer that features cutting-edge technology.

- - - #009688 - - - https://github.com/SoftFever/OrcaSlicer/commit/951fc8e98a0d5ca0ccb254315646ce7889a44836 - - - diff --git a/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml b/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml index 4408856157..28a2bda246 100644 --- a/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml +++ b/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml @@ -1,4 +1,4 @@ -app-id: io.github.softfever.Snapmaker_Orca +app-id: io.github.Snapmaker.Snapmaker_Orca runtime: org.gnome.Platform runtime-version: "48" sdk: org.gnome.Sdk @@ -16,7 +16,7 @@ finish-args: - --filesystem=/media - --filesystem=/run/spnav.sock:ro # Allow Snapmaker_Orca to talk to other instances - - --talk-name=io.github.softfever.Snapmaker_Orca.InstanceCheck.* + - --talk-name=io.github.Snapmaker.Snapmaker_Orca.InstanceCheck.* - --system-talk-name=org.freedesktop.UDisks2 - --env=SPNAV_SOCKET=/run/spnav.sock @@ -305,7 +305,7 @@ modules: # AppData metainfo for Gnome Software & Co. - type: file - path: io.github.softfever.Snapmaker_Orca.metainfo.xml + path: io.github.Snapmaker.Snapmaker_Orca.metainfo.xml # start-up script - type: file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2d5d2d633e..40e49d104f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -95,9 +95,9 @@ if(ORCA_TOOLS) MACOSX_BUNDLE_BUNDLE_NAME "Snapmaker_Orca Profile Validator" MACOSX_BUNDLE_BUNDLE_VERSION "${SLIC3R_VERSION}" MACOSX_BUNDLE_SHORT_VERSION_STRING "${SLIC3R_VERSION}" - MACOSX_BUNDLE_IDENTIFIER "com.softfever.Snapmaker_Orca.profile-validator" + MACOSX_BUNDLE_IDENTIFIER "com.Snapmaker.Snapmaker_Orca.profile-validator" MACOSX_BUNDLE_COPYRIGHT "© 2024 SoftFever" - MACOSX_BUNDLE_GUI_IDENTIFIER "com.softfever.Snapmaker_Orca.profile-validator" + MACOSX_BUNDLE_GUI_IDENTIFIER "com.Snapmaker.Snapmaker_Orca.profile-validator" ) else() add_executable(Snapmaker_Orca_profile_validator dev-utils/Snapmaker_Orca_profile_validator.cpp)