fix: tooling lint issues/ci update

Signed-off-by: Mike Nguyen <[email protected]>
dapr · Nov 7, 2024 · 7240e2f · 7240e2f
1 parent 60dc6a8
commit 7240e2f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/.github/workflows/dapr-bot/go.mod b/.github/workflows/dapr-bot/go.mod
@@ -1,8 +1,6 @@
 module github.com/dapr/go-sdk/.github/workflows/dapr-bot
 
-go 1.22
-
-toolchain go1.22.0
+go 1.23.3
 
 require (
 	github.com/google/go-github/v55 v55.0.0

diff --git a/.github/workflows/test-dapr-bot.yml b/.github/workflows/test-dapr-bot.yml
@@ -17,7 +17,6 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     env:
-      GOVER: ${{ matrix.gover }}
       GOLANGCILINT_VER: v1.61.0
 
     steps:

diff --git a/.github/workflows/test-tooling.yml b/.github/workflows/test-tooling.yml
@@ -19,16 +19,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gover:
-          - "1.21"
-          - "1.22"
         os:
           - "ubuntu-latest"
           - "windows-latest"
           - "macos-latest"
     runs-on: ${{ matrix.os }}
     env:
-      GOVER: ${{ matrix.gover }}
       GOLANGCILINT_VER: v1.61.0 # Make sure to bump /tools/check-lint-version/main_test.go
 
     steps:
@@ -38,7 +34,7 @@ jobs:
       - name: Setup
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GOVER }}
+          go-version-file: ./tools/check-lint-version/go.mod
 
       - name: Tidy
         working-directory: ./tools/check-lint-version

diff --git a/tools/check-lint-version/go.mod b/tools/check-lint-version/go.mod
@@ -1,8 +1,6 @@
 module github.com/dapr/go-sdk/tools/check-lint-version
 
-go 1.21
-
-toolchain go1.21.6
+go 1.23.3
 
 require (
 	github.com/stretchr/testify v1.8.4

diff --git a/tools/check-lint-version/main.go b/tools/check-lint-version/main.go
@@ -51,7 +51,7 @@ func getCurrentVersion() (string, error) {
 	if matches == nil {
 		return "", fmt.Errorf("no version found: %v", string(out))
 	}
-	return fmt.Sprintf("v%s", matches[1]), err
+	return "v" + matches[1], err
 }
 
 func isVersionValid(workflowVersion, currentVersion string) bool {
@@ -72,7 +72,7 @@ func compareVersions(path string) string {
 	if !validVersion {
 		return fmt.Sprintf("Invalid version, expected: %s, current: %s - See: https://golangci-lint.run/usage/install/ for instructions to update", workflowVersion, currentVersion)
 	}
-	return fmt.Sprintf("Linter version is valid (MajorMinor): %s", currentVersion)
+	return "Linter version is valid (MajorMinor): " + currentVersion
 }
 
 func main() {