Skip to content

Commit 7333f2a

Browse files
committed
fix: tooling lint issues/ci update
Signed-off-by: Mike Nguyen <[email protected]>
1 parent 60dc6a8 commit 7333f2a

File tree

5 files changed

+5
-14
lines changed

5 files changed

+5
-14
lines changed

.github/workflows/dapr-bot/go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/dapr/go-sdk/.github/workflows/dapr-bot
22

3-
go 1.22
4-
5-
toolchain go1.22.0
3+
go 1.23.3
64

75
require (
86
github.com/google/go-github/v55 v55.0.0

.github/workflows/test-dapr-bot.yml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
name: Test
1818
runs-on: ubuntu-latest
1919
env:
20-
GOVER: ${{ matrix.gover }}
2120
GOLANGCILINT_VER: v1.61.0
2221

2322
steps:

.github/workflows/test-tooling.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,12 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
gover:
23-
- "1.21"
24-
- "1.22"
2522
os:
2623
- "ubuntu-latest"
2724
- "windows-latest"
2825
- "macos-latest"
2926
runs-on: ${{ matrix.os }}
3027
env:
31-
GOVER: ${{ matrix.gover }}
3228
GOLANGCILINT_VER: v1.61.0 # Make sure to bump /tools/check-lint-version/main_test.go
3329

3430
steps:
@@ -38,7 +34,7 @@ jobs:
3834
- name: Setup
3935
uses: actions/setup-go@v5
4036
with:
41-
go-version: ${{ env.GOVER }}
37+
go-version: ./tools/check-lint-version/go.mod
4238

4339
- name: Tidy
4440
working-directory: ./tools/check-lint-version

tools/check-lint-version/go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/dapr/go-sdk/tools/check-lint-version
22

3-
go 1.21
4-
5-
toolchain go1.21.6
3+
go 1.23.3
64

75
require (
86
github.com/stretchr/testify v1.8.4

tools/check-lint-version/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func getCurrentVersion() (string, error) {
5151
if matches == nil {
5252
return "", fmt.Errorf("no version found: %v", string(out))
5353
}
54-
return fmt.Sprintf("v%s", matches[1]), err
54+
return "v" + matches[1], err
5555
}
5656

5757
func isVersionValid(workflowVersion, currentVersion string) bool {
@@ -72,7 +72,7 @@ func compareVersions(path string) string {
7272
if !validVersion {
7373
return fmt.Sprintf("Invalid version, expected: %s, current: %s - See: https://golangci-lint.run/usage/install/ for instructions to update", workflowVersion, currentVersion)
7474
}
75-
return fmt.Sprintf("Linter version is valid (MajorMinor): %s", currentVersion)
75+
return "Linter version is valid (MajorMinor): " + currentVersion
7676
}
7777

7878
func main() {

0 commit comments

Comments
 (0)