juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-28 11:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix the flatpak dependency cache broken by #14709 (#15763)

Browse Source
This commit is contained in:
Kris Austin
2026-09-18 17:47:28 -03:00
committed by GitHub
parent f956914a11
commit 8eac7aafdb
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build_all.yml
+4 -6
View File
@@ -330,12 +330,13 @@ jobs:
# sources are unchanged, so a re-run of the same commit would skip the # 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 # 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 # env keeps it rebuilding; orca_deps stays cached, and the compiler cache
# still serves the rebuild. # still serves the rebuild. run-tests on the same module builds the test
- name: Inject commit hash and flatpak-builder cache buster into Flatpak manifest # binaries.
- name: Inject commit hash, run-tests and cache buster into Flatpak manifest
env: env:
flatpak_builder_cache_buster: ${{ github.run_id }}-${{ github.run_attempt }} flatpak_builder_cache_buster: ${{ github.run_id }}-${{ github.run_attempt }}
run: | 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 scripts/flatpak/com.orcaslicer.OrcaSlicer.yml
shell: bash shell: bash
# flatpak-builder's --ccache only wraps cc and gcc, and the manifest builds # flatpak-builder's --ccache only wraps cc and gcc, and the manifest builds
@@ -381,9 +382,6 @@ jobs:
save-cache: false save-cache: false
arch: ${{ matrix.variant.arch }} arch: ${{ matrix.variant.arch }}
upload-artifact: false 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 keep-build-dirs: true
# The build has just touched everything it can use, so an object untouched # The build has just touched everything it can use, so an object untouched
# for a week is dead, usually orphaned by a flag change. # for a week is dead, usually orphaned by a flag change.
scripts/flatpak/com.orcaslicer.OrcaSlicer.yml
+1 -1
View File
@@ -384,7 +384,7 @@ modules:
- cmake --build build_flatpak --target generate_system_cache -j$FLATPAK_BUILDER_N_JOBS - 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 - ./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 job. Only the test sources compile; nothing installs to /app.
test-commands: test-commands:
- cmake . -B build_flatpak -DBUILD_TESTS=ON - cmake . -B build_flatpak -DBUILD_TESTS=ON