Skip to content

Commit f2190a1

Browse files
Merge branch 'main' into release-please--branches--main
2 parents 617c698 + 40b8475 commit f2190a1

6 files changed

Lines changed: 8 additions & 12 deletions

File tree

.github/workflows/lint_golang.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v5
19-
- uses: actions/setup-go@v5
19+
- uses: actions/setup-go@v6
2020
id: go
2121
with:
2222
go-version-file: go.mod
@@ -34,5 +34,5 @@ jobs:
3434
- name: golangci-lint
3535
uses: golangci/golangci-lint-action@v8
3636
with:
37-
version: v2.4.0
37+
version: v2.5.0
3838
args: --verbose

.github/workflows/regen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v5
16-
- uses: actions/setup-go@v5
16+
- uses: actions/setup-go@v6
1717
id: go
1818
with:
1919
go-version-file: go.mod

.github/workflows/release_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
prerelease: true
3232
- name: Trigger Renovate
33-
uses: actions/github-script@v7
33+
uses: actions/github-script@v8
3434
if: steps.release.outputs.release_created && steps.semver_parser.outputs.prerelease == ''
3535
with:
3636
github-token: ${{ secrets.GH_CQ_BOT }}

.github/workflows/unittest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Check out code into the Go module directory
2323
uses: actions/checkout@v5
2424
- name: Set up Go 1.x
25-
uses: actions/setup-go@v5
25+
uses: actions/setup-go@v6
2626
with:
2727
go-version-file: go.mod
2828
- run: go mod download

managedplugin/plugin.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,10 @@ func (c *Client) execPlugin(ctx context.Context) error {
246246
return c.connectUsingTCP(ctx, c.config.Path)
247247
case RegistryLocal:
248248
return c.startLocal(ctx, c.config.Path)
249-
case RegistryGithub:
249+
case RegistryGithub, RegistryCloudQuery:
250250
return c.startLocal(ctx, c.LocalPath)
251251
case RegistryDocker:
252252
return c.startDockerPlugin(ctx, c.config.Path)
253-
case RegistryCloudQuery:
254-
return c.startLocal(ctx, c.LocalPath)
255253
default:
256254
return fmt.Errorf("unknown registry %s", c.config.Registry.String())
257255
}
@@ -260,7 +258,7 @@ func (c *Client) execPlugin(ctx context.Context) error {
260258
func (c *Client) ConnectionString() string {
261259
tgt := c.Conn.Target()
262260
switch c.registry {
263-
case RegistryGrpc:
261+
case RegistryGrpc, RegistryDocker:
264262
return tgt
265263
case RegistryLocal,
266264
RegistryGithub,
@@ -269,8 +267,6 @@ func (c *Client) ConnectionString() string {
269267
return tgt
270268
}
271269
return "unix://" + tgt
272-
case RegistryDocker:
273-
return tgt
274270
}
275271
return tgt
276272
}

tests/progressbar_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package test
1+
package tests
22

33
import (
44
"strings"

0 commit comments

Comments
 (0)