mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-05-25 23:21:15 -03:00
61884bda36
Looks like the github actions image now has ninja installed. This causes a failure; we effectively do $ ( mkdir build && cd build cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo ) $ make VERBOSE=1 [...] cd build; cmake .. -G "Ninja" \ -DCMAKE_INSTALL_PREFIX="/usr/local" -DCMAKE_EXPORT_COMPILE_COMMANDS=1 Re-run cmake no build system arguments CMake Error: Error: generator : Ninja Does not match the generator used previously: Unix Makefiles Either remove the CMakeCache.txt file and CMakeFiles directory or choose a different binary directory. "make" fails because it runs from top-level, with GNUMakefile's logic to use -GNinja if available. This is at odds with the direct cmake invocation, which defaults to -G'Unix Makefiles'. We shouldn't mix direct cmake invocation and the top-level Makefiles, so run make from the build directory instead. While at it, update some test invocations missed in8d6fdfd9de(Remove cmake "test" target, 2025-02-02). This should help avoid missing test failure output in CI, see https://github.com/fish-shell/fish-shell/issues/11116#issuecomment-2629406479 (cherry picked from commitb0be53ed6a)