Skip to content

Commit

Permalink
feat: build and deploy with the cluster OS/ARCH (#4403)
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartwdouglas authored Feb 13, 2025
1 parent ea83c9a commit 8ad5bcf
Show file tree
Hide file tree
Showing 17 changed files with 815 additions and 496 deletions.
5 changes: 5 additions & 0 deletions backend/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"hash"
"io"
"net/url"
"runtime"
"sort"
"strings"
"sync"
Expand Down Expand Up @@ -148,6 +149,10 @@ type Service struct {
runnerState eventstream.EventStream[state.RunnerState, state.RunnerEvent]
}

func (s *Service) ClusterInfo(ctx context.Context, req *connect.Request[ftlv1.ClusterInfoRequest]) (*connect.Response[ftlv1.ClusterInfoResponse], error) {
return connect.NewResponse(&ftlv1.ClusterInfoResponse{Os: runtime.GOOS, Arch: runtime.GOARCH}), nil
}

func New(
ctx context.Context,
adminClient ftlv1connect.AdminServiceClient,
Expand Down
477 changes: 248 additions & 229 deletions backend/protos/xyz/block/ftl/language/v1/language.pb.go

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions backend/protos/xyz/block/ftl/language/v1/language.proto
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ message BuildContext {
repeated string dependencies = 4;
// Build environment provides environment variables to be set for the build command
repeated string build_env = 5;
string os = 6;
string arch = 7;
}

message BuildContextUpdatedRequest {
Expand Down
Loading

0 comments on commit 8ad5bcf

Please sign in to comment.