Improve makefile targets and target names

.github/workflows/go.yml

@@ -83,9 +83,9 @@ jobs:
               working-directory: ./go
               run: make lint
 
-            - name: Run unit tests
+            - name: Run tests
               working-directory: ./go
-              run: make unit-test-report
+              run: make test-and-report
 
             - name: Upload test reports
               if: always()
@@ -94,7 +94,7 @@ jobs:
               with:
                   name: test-reports-go-${{ matrix.go }}-redis-${{ matrix.redis }}-${{ matrix.os }}
                   path: |
-                      go/reports/unit-test-report.html
+                      go/reports/test-report.html
 
     build-amazonlinux-latest:
         if: github.repository_owner == 'aws'
@@ -164,17 +164,17 @@ jobs:
               working-directory: ./go
               run: make lint
 
-            - name: Run unit tests
+            - name: Run tests
               working-directory: ./go
-              run: make unit-test-report
+              run: make test-and-report
 
             - name: Upload test reports
               if: always()
               continue-on-error: true
               uses: actions/upload-artifact@v4
               with:
                   name: test-reports-go-${{ matrix.go }}-amazon-linux-latest
-                  path: go/reports/unit-test-report.html
+                  path: go/reports/test-report.html
 
     lint-rust:
         timeout-minutes: 15

go/Makefile

@@ -1,16 +1,21 @@
-install-tools-go1.18:
-	go install github.com/vakenbolt/[email protected]
+install-build-tools:
 	go install google.golang.org/protobuf/cmd/[email protected]
+
+install-dev-tools-go1.18:
+	go install github.com/vakenbolt/[email protected]
 	go install mvdan.cc/[email protected]
 	go install github.com/segmentio/[email protected]
 	go install honnef.co/go/tools/cmd/[email protected]
 
-install-tools:
+install-dev-tools:
 	go install github.com/vakenbolt/[email protected]
-	go install google.golang.org/protobuf/cmd/[email protected]
-	go install mvdan.cc/[email protected]
-	go install github.com/segmentio/[email protected]
-	go install honnef.co/go/tools/cmd/[email protected]
+	go install mvdan.cc/[email protected]
+	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-tools: install-build-tools install-dev-tools
 
 build: build-glide-core build-glide-client generate-protobuf
 	go build ./...
@@ -41,6 +46,9 @@ format:
 	gofumpt -w .
 	golines -w --shorten-comments -m 127 .
 
-unit-test-report:
+test:
+	go test -race ./...
+
+test-and-report:
 	mkdir -p reports
-	go test -race ./... -json | go-test-report -o reports/unit-test-report.html
+	go test -race ./... -json | go-test-report -o reports/test-report.html