Skip to content

Commit 2355f33

Browse files
committed
Merge branch 'master' of github.com:zhouselena/mongo-go-driver into GODRIVER-3102-5
2 parents 53c83de + 779938e commit 2355f33

Some content is hidden

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

44 files changed

+333
-323
lines changed

.github/workflows/codeql.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,19 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches: [ "v1", "cloud-*", "master", "release/*" ]
5+
branches:
6+
- "v1"
7+
- "cloud-*"
8+
- "master"
9+
- "release/*"
10+
- "feature/*"
611
pull_request:
7-
branches: [ "v1", "cloud-*", "master", "release/*" ]
12+
branches:
13+
- "v1"
14+
- "cloud-*"
15+
- "master"
16+
- "release/*"
17+
- "feature/*"
818
schedule:
919
- cron: '36 17 * * 0'
1020
workflow_call:

internal/integration/clam_prose_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func clamDefaultTruncLimitOp(ctx context.Context, mt *mtest.T, coll *mongo.Colle
3636

3737
// Construct an array of docs containing the document {"x" : "y"}
3838
// repeated "documentSize" times.
39-
docs := []interface{}{}
39+
docs := []any{}
4040
for i := 0; i < documentsSize; i++ {
4141
docs = append(docs, bson.D{{"x", "y"}})
4242
}
@@ -346,7 +346,7 @@ func TestCommandLoggingAndMonitoringProse(t *testing.T) {
346346
sinkCtx, sinkCancel := context.WithDeadline(ctx, time.Now().Add(deadline))
347347
defer sinkCancel()
348348

349-
validator := func(order int, _ int, _ string, keysAndValues ...interface{}) error {
349+
validator := func(order int, _ int, _ string, keysAndValues ...any) error {
350350
// If the order exceeds the length of the
351351
// "orderedCaseValidators," then throw an error.
352352
if order >= len(tcase.orderedLogValidators) {

0 commit comments

Comments
 (0)