From 8eac7aafdb276247f994d8495e5fd6b781756e10 Mon Sep 17 00:00:00 2001
From: Kris Austin <kris.austin@gmail.com>
Date: Fri, 18 Sep 2026 15:47:28 -0500
Subject: [PATCH] ci: fix the flatpak dependency cache broken by #14709
 (#15763)

---
 .github/workflows/build_all.yml               | 10 ++++------
 scripts/flatpak/com.orcaslicer.OrcaSlicer.yml |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
index e0d2e1ea6c..ed106ec65e 100644
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -330,12 +330,13 @@ jobs:
     # sources are unchanged, so a re-run of the same commit would skip the
     # OrcaSlicer module and ship no test asset. A per-run value in that module's
     # env keeps it rebuilding; orca_deps stays cached, and the compiler cache
-    # still serves the rebuild.
-    - name: Inject commit hash and flatpak-builder cache buster into Flatpak manifest
+    # still serves the rebuild. run-tests on the same module builds the test
+    # binaries.
+    - name: Inject commit hash, run-tests and cache buster into Flatpak manifest
       env:
         flatpak_builder_cache_buster: ${{ github.run_id }}-${{ github.run_attempt }}
       run: |
-        sed -i "/name: OrcaSlicer/{n;s|buildsystem: simple|buildsystem: simple\n    build-options:\n      env:\n        flatpak_builder_cache_buster: \"$flatpak_builder_cache_buster\"\n        git_commit_hash: \"$git_commit_hash\"|}" \
+        sed -i "/name: OrcaSlicer/{n;s|buildsystem: simple|buildsystem: simple\n    run-tests: true\n    build-options:\n      env:\n        flatpak_builder_cache_buster: \"$flatpak_builder_cache_buster\"\n        git_commit_hash: \"$git_commit_hash\"|}" \
           scripts/flatpak/com.orcaslicer.OrcaSlicer.yml
       shell: bash
     # flatpak-builder's --ccache only wraps cc and gcc, and the manifest builds
@@ -381,9 +382,6 @@ jobs:
         save-cache: false
         arch: ${{ matrix.variant.arch }}
         upload-artifact: false
-        # run-tests fires the module's build-only test-commands; keep-build-dirs
-        # retains the binaries for the packaging step below.
-        run-tests: true
         keep-build-dirs: true
     # The build has just touched everything it can use, so an object untouched
     # for a week is dead, usually orphaned by a flag change.
diff --git a/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml b/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml
index fa7c329b4b..404dbf5fe4 100644
--- a/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml
+++ b/scripts/flatpak/com.orcaslicer.OrcaSlicer.yml
@@ -384,7 +384,7 @@ modules:
       - cmake --build build_flatpak --target generate_system_cache -j$FLATPAK_BUILDER_N_JOBS
       - ./scripts/build_preset_cache.sh -n -b build_flatpak /app/share/OrcaSlicer/profiles
 
-    # Built (not run) here via the action's run-tests, then shipped to a separate
+    # Built (not run) here when CI injects run-tests, then shipped to a separate
     # test job. Only the test sources compile; nothing installs to /app.
     test-commands:
       - cmake . -B build_flatpak -DBUILD_TESTS=ON