Merge pull request #1652 from xormania/fix/hlsl-cargo-install-locked

HLSL: build shader_language_server with cargo --locked to fix macOS CI
This commit is contained in:
Dr. Dominik Jain authored and GitHub committed 2026-07-06 12:29:27 +02:00
commit f6b6efa65b
2 files changed
+6 -2

No files matched your search

+4
View File
@@ -49,6 +49,10 @@ Status of the `main` branch. Changes prior to the next official version change w
* Language Servers:
- C/C++ (clangd): improve support and documentation for Unreal Engine 5 projects.
- HLSL (`shader-language-server`): pass `--locked` to `cargo install` when building from source
on macOS (and in the manual-install instructions), honoring the crate's packaged `Cargo.lock`.
Without it, fresh dependency resolution pulled in shader-sense 1.4.0, which no longer compiles
against the pinned shader_language_server 1.3.1, breaking the macOS CI job.
- `typescript_vts`: Add `initialization_options` setting in `ls_specific_settings.typescript_vts`.
Enables Yarn PnP setups with `typescript.tsdk` pointing at the Yarn-generated SDK.
- TypeScript/VTS: disable automatic typing acquisition during initialization (no network
@@ -81,7 +81,7 @@ class HlslLanguageServer(SolidLanguageServer):
base_url = f"{_GITHUB_RELEASE_BASE}/{tag}"
# macOS has no pre-built binaries; build from source via cargo install
cargo_install_cmd = ["cargo", "install", "shader_language_server", "--version", version, "--root", "."]
cargo_install_cmd = ["cargo", "install", "shader_language_server", "--version", version, "--locked", "--root", "."]
deps = RuntimeDependencyCollection(
[
@@ -141,7 +141,7 @@ class HlslLanguageServer(SolidLanguageServer):
raise FileNotFoundError(
"shader-language-server is not installed and no auto-install is available for your platform.\n"
"Please install it using one of the following methods:\n"
" cargo: cargo install shader_language_server\n"
" cargo: cargo install shader_language_server --locked\n"
" GitHub: Download from https://github.com/antaalt/shader-sense/releases\n"
"On macOS, install the Rust toolchain (https://rustup.rs) and Serena will build from source automatically.\n"
"See https://github.com/antaalt/shader-sense for more details."