8000 Merge branch 'main' of github.com:/coder/coder into dk/prebuilds · coder/coder@0898097 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 0898097

Browse files
dannykoppingdannykopping
committed
Merge branch 'main' of github.com:/coder/coder into dk/prebuilds
2 parents ada06ec + afb175d commit 0898097

File tree

12 files changed

+202
-85
lines changed

12 files changed

+202
-85
lines changed

‎cli/server.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2160,6 +2160,8 @@ func startBuiltinPostgres(ctx context.Context, cfg config.Root, logger slog.Logg
21602160
embeddedpostgres.DefaultConfig().
21612161
Version(embeddedpostgres.V13).
21622162
BinariesPath(filepath.Join(cfg.PostgresPath(), "bin")).
2163+
// Default BinaryRepositoryURL repo1.maven.org is flaky.
2164+
BinaryRepositoryURL("https://repo.maven.apache.org/maven2").
21632165
DataPath(filepath.Join(cfg.PostgresPath(), "data")).
21642166
RuntimePath(filepath.Join(cfg.PostgresPath(), "runtime")).
21652167
CachePath(cachePath).

‎codersdk/deployment.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3308,6 +3308,7 @@ const (
33083308
// Experiments that are not ready for consumption by all users should
33093309
// not be included here and will be essentially hidden.
33103310
var ExperimentsAll = Experiments{
3311+
ExperimentDynamicParameters,
33113312
ExperimentWorkspacePrebuilds,
33123313
}
33133314

‎go.mod

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ require (
9191
github.com/cespare/xxhash/v2 v2.3.0
9292
github.com/charmbracelet/bubbles v0.21.0
9393
github.com/charmbracelet/bubbletea v1.3.4
94-
github.com/charmbracelet/glamour v0.9.1
95-
github.com/charmbracelet/lipgloss v1.1.0
94+
github.com/charmbracelet/glamour v0.10.0
95+
github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834
9696
github.com/chromedp/cdproto v0.0.0-20250319231242-a755498943c8
9797
github.com/chromedp/chromedp v0.13.3
9898
github.com/cli/safeexec v1.0.1
@@ -102,7 +102,7 @@ require (
102102
github.com/coder/quartz v0.1.2
103103
github.com/coder/retry v1.5.1
104104
github.com/coder/serpent v0.10.0
105-
github.com/coder/terraform-provider-coder/v2 v2.4.0-pre0
105+
github.com/coder/terraform-provider-coder/v2 v2.4.0-pre1
106106
github.com/coder/websocket v1.8.13
107107
github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0
108108
github.com/coreos/go-oidc/v3 v3.14.1
@@ -155,7 +155,7 @@ require (
155155
github.com/mattn/go-isatty v0.0.20
156156
github.com/mitchellh/go-wordwrap v1.0.1
157157
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
158-
github.com/moby/moby v28.0.0+incompatible
158+
github.com/moby/moby v28.1.1+incompatible
159159
github.com/mocktools/go-smtp-mock/v2 v2.4.0
160160
github.com/muesli/termenv v0.16.0
161161
github.com/natefinch/atomic v1.0.1
@@ -207,8 +207,8 @@ require (
207207
golang.org/x/text v0.24.0 // indirect
208208
golang.org/x/tools v0.32.0
209209
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
210-
google.golang.org/api v0.228.0
211-
google.golang.org/grpc v1.71.0
210+
google.golang.org/api v0.229.0
211+
google.golang.org/grpc v1.72.0
212212
google.golang.org/protobuf v1.36.6
213213
gopkg.in/DataDog/dd-trace-go.v1 v1.72.1
214214
gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -220,7 +220,7 @@ require (
220220
)
221221

222222
require (
223-
cloud.google.com/go/auth v0.15.0 // indirect
223+
cloud.google.com/go/auth v0.16.0 // indirect
224224
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
225225
cloud.google.com/go/logging v1.13.0 // indirect
226226
cloud.google.com/go/longrunning v0.6.4 // indirect
@@ -446,7 +446,7 @@ require (
446446
github.com/yuin/goldmark-emoji v1.0.5 // indirect
447447
github.com/yusufpapurcu/wmi v1.2.4 // indirect
448448
github.com/zclconf/go-cty v1.16.2
449-
github.com/zeebo/errs v1.3.0 // indirect
449+
github.com/zeebo/errs v1.4.0 // indirect
450450
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
451451
go.opentelemetry.io/collector/component v0.104.0 // indirect
452452
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
@@ -467,7 +467,7 @@ require (
467467
google.golang.org/appengine v1.6.8 // indirect
468468
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
469469
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
470-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
470+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
471471
gopkg.in/ini.v1 v1.67.0 // indirect
472472
gopkg.in/yaml.v2 v2.4.0 // indirect
473473
howett.net/plist v1.0.0 // indirect
@@ -481,7 +481,7 @@ require github.com/SherClockHolmes/webpush-go v1.4.0
481481

482482
require (
483483
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
484-
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
484+
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
485485
github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874 // indirect
486486
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
487487
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
@@ -490,23 +490,24 @@ require (
490490
require (
491491
github.com/coder/preview v0.0.0-20250417203026-7edcb9e02d99
492492
github.com/kylecarbs/aisdk-go v0.0.5
493-
github.com/mark3labs/mcp-go v0.20.1
493+
github.com/mark3labs/mcp-go v0.22.0
494494
)
495495

496496
require (
497-
cel.dev/expr v0.19.2 // indirect
497+
cel.dev/expr v0.20.0 // indirect
498498
cloud.google.com/go v0.120.0 // indirect
499499
cloud.google.com/go/iam v1.4.0 // indirect
500500
cloud.google.com/go/monitoring v1.24.0 // indirect
501501
cloud.google.com/go/storage v1.50.0 // indirect
502-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
502+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
503503
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
504504
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
505505
github.com/anthropics/anthropic-sdk-go v0.2.0-beta.3 // indirect
506506
github.com/aquasecurity/go-version v0.0.1 // indirect
507507
github.com/aquasecurity/trivy v0.58.2 // indirect
508508
github.com/aws/aws-sdk-go v1.55.6 // indirect
509509
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
510+
github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf // indirect
510511
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
511512
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
512513
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
@@ -518,12 +519,13 @@ require (
518519
github.com/openai/openai-go v0.1.0-beta.6 // indirect
519520
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
520521
github.com/samber/lo v1.49.1 // indirect
522+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
521523
github.com/tidwall/sjson v1.2.5 // indirect
522524
github.com/ulikunitz/xz v0.5.12 // indirect
523525
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
524526
github.com/zeebo/xxh3 v1.0.2 // indirect
525527
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
526-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
528+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
527529
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
528530
google.golang.org/genai v0.7.0 // indirect
529531
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

0 commit comments

Comments
 (0)
0