PR suggestions

Bit-Quill · Feb 27, 2024 · a62b9fe · a62b9fe
1 parent 6301ca6
commit a62b9fe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -29,8 +29,8 @@ jobs:
             fail-fast: false
             matrix:
                 go:
-                    - '1.18'
-                    - '1.22'
+                    - '1.18.10'
+                    - '1.22.0'
                 redis:
                     - 6.2.14
                     - 7.2.3
@@ -141,14 +141,8 @@ jobs:
                   echo "$HOME/go/bin" >> $GITHUB_PATH
 
             - name: Install tools for Go ${{ matrix.go }}
-              if: ${{ matrix.go == '1.18.10' }}
               working-directory: ./go
-              run: make install-tools-go1.18
-
-            - name: Install tools for Go ${{ matrix.go }}
-              if: ${{ matrix.go == '1.22.0' }}
-              working-directory: ./go
-              run: make install-tools-go1.22
+              run: make install-tools-go${{ matrix.go }}
 
             - name: Build client
               working-directory: ./go

diff --git a/go/Makefile b/go/Makefile
@@ -13,9 +13,13 @@ install-dev-tools-go1.22:
 	go install github.com/segmentio/[email protected]
 	go install honnef.co/go/tools/cmd/[email protected]
 
-install-tools-go1.18: install-build-tools install-dev-tools-go1.18
+install-dev-tools: install-dev-tools-go1.22
 
-install-tools-go1.22: install-build-tools install-dev-tools-go1.22
+install-tools-go1.18.10: install-build-tools install-dev-tools-go1.18
+
+install-tools-go1.22.0: install-build-tools install-dev-tools-go1.22
+
+install-tools: install-tools-go1.22.0
 
 build: build-glide-core build-glide-client generate-protobuf
 	go build ./...