Skip to content

Commit 5285733

Browse files
committed
again
1 parent c69ffc9 commit 5285733

3 files changed

Lines changed: 7 additions & 13 deletions

File tree

.github/actions/setup-tools/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
using: "composite"
1212
steps:
1313
- name: Setup mise
14-
if: inputs.install-mise == 'true'
1514
uses: jdx/mise-action@v2
1615
with:
17-
cache: false
16+
install: false
17+
cache: true

engine/language_client_cffi/build.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -369,12 +369,9 @@ fn main() -> std::io::Result<()> {
369369
{
370370
Ok(output) if output.status.success() => {
371371
let path = String::from_utf8_lossy(&output.stdout);
372-
if !path.is_empty() {
373-
eprintln!("Using protoc-gen-go from mise: {}", path);
374-
protoc.plugin(path.trim());
375-
} else {
376-
eprintln!("protoc-gen-go fallback: mise which returned empty path, relying on PATH");
377-
}
372+
let path = path.trim();
373+
eprintln!("Using protoc-gen-go from mise: {:?}", path);
374+
protoc.plugin(path);
378375
}
379376
Ok(_) => {
380377
eprintln!(

mise.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ node = "lts" # For pnpm
1717
# Go tools
1818
# locked to match the version in .github/actions/setup-go/action.yml
1919
"protoc-gen-go" = "v1.34.1"
20-
"go:golang.org/x/tools/cmd/goimports" = "latest"
21-
"go:github.com/chrishrb/go-grip" = "latest"
22-
23-
20+
"go:golang.org/x/tools/cmd/goimports" = "0.36.0"
2421

2522
# Python tools
2623
"pipx:uv" = "latest"
@@ -33,4 +30,4 @@ node = "lts" # For pnpm
3330

3431
[settings]
3532
experimental = true
36-
# idiomatic_version_file_enable_tools = ["node", "python", "ruby", "go"]
33+
# idiomatic_version_file_enable_tools = ["node", "python", "ruby", "go"]

0 commit comments

Comments
 (0)