From 0458925f85875d7aac4f1f10b70e90d0eec84964 Mon Sep 17 00:00:00 2001 From: ExPikaPaka Date: Thu, 4 Jun 2026 17:41:40 +0200 Subject: [PATCH] Install proto before flatpack when there is internet. Add missing include that caused fail only on Unix --- .github/workflows/build_all.yml | 6 ++++++ scripts/flatpak/com.orcaslicer.OrcaSlicer.yml | 2 -- src/slic3r/GUI/TabLayoutExtra.cpp | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 79ffafa0f1..2391575228 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -211,6 +211,12 @@ jobs: sed -i "/name: OrcaSlicer/{n;s|buildsystem: simple|buildsystem: simple\n build-options:\n env:\n git_commit_hash: \"$git_commit_hash\"|}" \ scripts/flatpak/com.orcaslicer.OrcaSlicer.yml shell: bash + - name: Generate config sources + run: | + python3 -m venv /tmp/codegen_venv + /tmp/codegen_venv/bin/pip install grpcio-tools pyyaml -q + /tmp/codegen_venv/bin/python tools/run_codegen.py + shell: bash - uses: flatpak/flatpak-github-actions/flatpak-builder@master with: bundle: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak diff --git a/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml b/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml index 287381c459..4412aacfa8 100644 --- a/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml +++ b/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml @@ -326,8 +326,6 @@ modules: - name: OrcaSlicer buildsystem: simple build-commands: - - pip3 install grpcio-tools -q - - python3 tools/run_codegen.py - | cmake . -B build_flatpak \ -DFLATPAK=ON \ diff --git a/src/slic3r/GUI/TabLayoutExtra.cpp b/src/slic3r/GUI/TabLayoutExtra.cpp index dd7bd2ccf8..e397b9ed2e 100644 --- a/src/slic3r/GUI/TabLayoutExtra.cpp +++ b/src/slic3r/GUI/TabLayoutExtra.cpp @@ -18,6 +18,7 @@ #include "WipeTowerDialog.hpp" // RammingDialog #include "MsgDialog.hpp" // InfoDialog #include "libslic3r/GCode/Thumbnails.hpp" +#include "format.hpp" namespace Slic3r { namespace GUI {