Refactor workflows: add reusable build workflow and replace duplicate…#2467
Merged
Refactor workflows: add reusable build workflow and replace duplicate…#2467
Conversation
…d platform jobs Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…)\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ion\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
… Ubuntu or requested\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…run-qt-min-version input Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
… queued jobs\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…IX script on Windows runners\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…able; keep packaging for non-Windows Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…runners (no bash dependency) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…args variable for cmake invocation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
… so source dir contains CMakeLists.txt Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ags being passed to non-MSVC compilers Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…inja mismatches) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…tputs (fixes missing Windows installers)\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…CPack outputs (fixes missing Windows installers)\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>" This reverts commit 37e5e4c.
…reusable workflow; handle mac repair script and Windows package target (preserves previous behavior)\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ginal workflows)\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
… steps on Unix (prevent cmd: not found and wrong paths)\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…id cmake_minimum_required compatibility error on CI\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…hored-by: Copilot <223556219+Copilot@users.noreply.github.com>
… Copilot <223556219+Copilot@users.noreply.github.com>
Remove build/_CPack_Packages/**, build/**/*.exe and build/**/*.zip from the artifact path list in .github/workflows/reusable-build.yml. This limits which build outputs are uploaded (MSI and platform-specific installers remain), reducing redundant artifact uploads and CI storage without changing job behavior.
…56219+Copilot@users.noreply.github.com>
jessdtate
approved these changes
Apr 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Branch: ci-clean-up (base: master)
Summary:
This branch refactors job YAMLs into a reusable workflow: .github/workflows/reusable-build.yml, reducing duplication and making CI configuration more modular.
Commits on branch (most recent first):
2763c23 Disable mac ospray job in mac.yml (Dan White)
91dd9f1 Update windows.yml (Dan White)
990e4ee Superbuild: pass CMAKE_POLICY_VERSION_MINIMUM for Tny external to avoid cmake_minimum_required compatibility error on CI\n\nCo-authored-by: Copilot 223556219+Copilot@users.noreply.github.com (Dan White)
895babc Fix: use full expression in if: conditions to avoid executing Windows steps on Unix (prevent cmd: not found and wrong paths)\n\nCo-authored-by: Copilot 223556219+Copilot@users.noreply.github.com (Dan White)
b2cbe64 Fix packaging: run package from bin/SCIRun on Unix/macOS (matches original workflows)\n\nCo-authored-by: Copilot 223556219+Copilot@users.noreply.github.com (Dan White)
b4a0125 Copy packaging/upload steps from original mac/windows workflows into reusable workflow; handle mac repair script and Windows package target (preserves previous behavior)\n\nCo-authored-by: Copilot 223556219+Copilot@users.noreply.github.com (Dan White)
287fcdf Revert "Windows: add packaging step and broaden upload globs; upload CPack outputs (fixes missing Windows installers)\n\nCo-authored-by: Copilot 223556219+Copilot@users.noreply.github.com" (Dan White)
37e5e4c Windows: add packaging step and broaden upload globs; upload CPack outputs (fixes missing Windows installers)\n\nCo-authored-by: Copilot 223556219+Copilot@users.noreply.github.com (Dan White)
68d879a Fix(windows): force Visual Studio generator on Windows (avoid MinGW/Ninja mismatches) (Dan White)
1b2e879 Fix(windows): use Visual Studio generator on Windows to avoid MSVC flags being passed to non-MSVC compilers (Dan White)
b47e52c Fix(windows): point CMake source to Superbuild (use -S ../Superbuild) so source dir contains CMakeLists.txt (Dan White)
46e0aca Fix(windows): avoid splatting expression in PowerShell; use separate args variable for cmake invocation (Dan White)
2584c1c Fix(windows): use native PowerShell CMake configure/build on Windows runners (no bash dependency) (Dan White)
5f72fa2 Fix(windows): add Windows-specific build step using Git Bash if available; keep packaging for non-Windows (Dan White)
0b5f820 Fix(windows): force bash shell for build and package steps to run POSIX script on Windows runners\n\nCo-authored-by: Copilot 223556219+Copilot@users.noreply.github.com (Dan White)
474b9bc ci: switch windows runners from windows-2019 to windows-2022 to avoid queued jobs\n\nCo-authored-by: Copilot 223556219+Copilot@users.noreply.github.com (Dan White)
d26e279 chore(ci): pass scirun-qt-min-version for mac qt6 jobs (Dan White)
ad26b90 Fix(mac): set SCIRUN_QT_MIN_VERSION when qt-version provided; add scirun-qt-min-version input (Dan White)
be6cd76 Fix(linux): add Prepare step to install Qt/system deps when runner is Ubuntu or requested\n\nCo-authored-by: Copilot 223556219+Copilot@users.noreply.github.com (Dan White)
ae14162 Fix: handle Qt path for linux by adding qt-path input and auto-detection\n\nCo-authored-by: Copilot 223556219+Copilot@users.noreply.github.com (Dan White)
f494bfa Fix: remove GITHUB_TOKEN secret from reusable workflow (reserved name)\n\nCo-authored-by: Copilot 223556219+Copilot@users.noreply.github.com (Dan White)
168acdd Refactor workflows: add reusable build workflow and replace duplicated platform jobs (Dan White)
Files changed:
M .github/workflows/ccpp.yml
M .github/workflows/mac.yml
A .github/workflows/reusable-build.yml
M .github/workflows/windows.yml
M Superbuild/TnyExternal.cmake
Details:
The mac-gui-ospray job in .github/workflows/mac.yml was disabled by adding a job-level condition 'if: false' to prevent the failing mac OSPRay build from running.
How to re-enable:
Note: This description summarizes all commits currently present on the branch ci-clean-up relative to master.