Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 74e8327

Browse files
aslilacaslilac
committed
Merge branch 'main' into lilac/files-cache
2 parents 2036845 + 184c1f0 commit 74e8327

File tree

110 files changed

+6918
-701
lines changed

Some content is hidden

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

110 files changed

+6918
-701
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ jobs:
252252
run: |
253253
go install google.golang.org/protobuf/cmd/[email protected]
254254
go install storj.io/drpc/cmd/[email protected]
255-
go install golang.org/x/tools/cmd/goimports@latest
255+
go install golang.org/x/tools/cmd/goimports@v0.31.0
256256
go install github.com/mikefarah/yq/[email protected]
257257
go install go.uber.org/mock/[email protected]
258258
@@ -299,6 +299,9 @@ jobs:
299299
- name: Setup Node
300300
uses: ./.github/actions/setup-node
301301

302+
- name: Check Go version
303+
run: IGNORE_NIX=true ./scripts/check_go_versions.sh
304+
302305
# Use default Go version
303306
- name: Setup Go
304307
uses: ./.github/actions/setup-go
@@ -860,7 +863,7 @@ jobs:
860863
run: |
861864
go install google.golang.org/protobuf/cmd/[email protected]
862865
go install storj.io/drpc/cmd/[email protected]
863-
go install golang.org/x/tools/cmd/goimports@latest
866+
go install golang.org/x/tools/cmd/goimports@v0.31.0
864867
go install github.com/mikefarah/yq/[email protected]
865868
go install go.uber.org/mock/[email protected]
866869

‎cli/clitest/golden.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import (
1111
"strings"
1212
"testing"
1313

14+
"github.com/google/go-cmp/cmp"
1415
"github.com/google/uuid"
16+
"github.com/stretchr/testify/assert"
1517
"github.com/stretchr/testify/require"
1618

1719
"github.com/coder/coder/v2/cli/config"
@@ -117,11 +119,7 @@ func TestGoldenFile(t *testing.T, fileName string, actual []byte, replacements m
117119
require.NoError(t, err, "read golden file, run \"make gen/golden-files\" and commit the changes")
118120

119121
expected = normalizeGoldenFile(t, expected)
120-
require.Equal(
121-
t, string(expected), string(actual),
122-
"golden file mismatch: %s, run \"make gen/golden-files\", verify and commit the changes",
123-
goldenPath,
124-
)
122+
assert.Empty(t, cmp.Diff(string(expected), string(actual)), "golden file mismatch (-want +got): %s, run \"make gen/golden-files\", verify and commit the changes", goldenPath)
125123
}
126124

127125
// normalizeGoldenFile replaces any strings that are system or timing dependent

‎cli/exp.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ func (r *RootCmd) expCmd() *serpent.Command {
1313
Children: []*serpent.Command{
1414
r.scaletestCmd(),
1515
r.errorExample(),
16+
r.mcpCommand(),
1617
r.promptExample(),
1718
r.rptyCommand(),
1819
},

0 commit comments

Comments
 (0)