Skip to content

Commit 1b895f4

Browse files
committed
Merge branch 'canary' into sam/jetbrains
2 parents c318b91 + 506e54b commit 1b895f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1141
-533
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ inputs:
7777
description: 'Go version to install'
7878
required: false
7979
default: '1.24'
80-
go-install-protoc-gen-go:
81-
description: 'Install protoc-gen-go'
82-
required: false
83-
default: 'true'
8480
go-install-goimports:
8581
description: 'Install goimports'
8682
required: false

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ inputs:
66
description: "Go version to install"
77
required: false
88
default: "1.23.11"
9-
install-protoc-gen-go:
10-
description: "Install protoc-gen-go"
11-
required: false
12-
default: "true"
139
cache:
1410
description: "Enable Go module caching"
1511
required: false
@@ -53,12 +49,6 @@ runs:
5349
fi
5450
shell: bash
5551

56-
- name: Install protoc-gen-go
57-
if: inputs.install-protoc-gen-go == 'true'
58-
# locked to match the version in mise.toml
59-
run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.6
60-
shell: bash
61-
6252
- name: Install goimports
6353
if: inputs.install-goimports == 'true'
6454
run: go install golang.org/x/tools/cmd/goimports@latest

.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_args: "protoc-gen-go"
17+
cache: true

.github/workflows/build-cli-release.reusable.yaml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
required: false
1515
push:
1616
branches:
17-
- protoc-fix
17+
- sam/mise-protoc-gen-go
1818
env:
1919
MACOSX_DEPLOYMENT_TARGET: "10.13"
2020
# Turbo remote caching
@@ -82,18 +82,10 @@ jobs:
8282
- name: Setup Go
8383
uses: ./.github/actions/setup-go
8484

85-
- name: Install protoc-gen-go into .cargo/bin
86-
shell: bash
87-
run: |
88-
# The cross-compile environment sanitizes the PATH, so we install the plugin
89-
# directly into a directory that is guaranteed to be in the PATH for cargo.
90-
# We also create a symlink from the go/bin to the cargo/bin for consistency.
91-
mkdir -p .cargo/bin
92-
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
93-
go install golang.org/x/tools/cmd/goimports@latest
94-
cp "$HOME/go/bin/protoc-gen-go" ".cargo/bin/"
95-
echo "Installed protoc-gen-go into .cargo/bin:"
96-
ls -la .cargo/bin
85+
86+
- uses: jdx/mise-action@v2
87+
with:
88+
install_args: "protoc-gen-go"
9789

9890
- name: Test protoc-gen-go availability
9991
id: protoc_gen_go_setup

engine/baml-compiler/src/builtin.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pub mod enums {
1717
pub fn builtin_classes() -> Vec<Class> {
1818
vec![Class {
1919
name: String::from(classes::REQUEST),
20+
methods: vec![],
2021
fields: vec![
2122
Field {
2223
name: String::from("base_url"),

0 commit comments

Comments
 (0)