Merge pull request #57 from linuxkit/update-gofmt

fix formatting

Author: deitch

.circleci/config.yml

@@ -8,27 +8,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.15
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.19
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.15
+        go-version: 1.19.2
       id: go
 
     - name: Set path
       run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
       env:
          GOPATH: ${{runner.workspace}}
 
+    - name: Check out code
+      uses: actions/checkout@v3
+
     - name: Get pre-requisites
       run: |
-            go get -u golang.org/x/lint/golint
-            go get -u github.com/gordonklaus/ineffassign
+            make install-deps
       env:
         GOPATH: ${{runner.workspace}}
 
-    - name: Check out code
-      uses: actions/checkout@v2
-
     - name: Tests
       run: |
         make test
@@ -45,14 +44,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.15
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.19
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.15
+        go-version: 1.19.2
       id: go
 
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: build
       id: build
@@ -70,7 +69,7 @@ jobs:
         GOPATH: ${{runner.workspace}}
 
     - name: Upload binary
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: rtf-binaries
         path: ${{steps.build.outputs.binary}}

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ DEPS+=$(wildcard sysinfo/*.go)
 
 PREFIX?=/usr/local
 
-GOLINT:=$(shell command -v golint 2> /dev/null)
+GOLINT:=$(shell command -v golangci-lint 2> /dev/null)
 INEFFASSIGN:=$(shell command -v ineffassign 2> /dev/null)
 
 default: rtf
@@ -43,27 +43,27 @@ rtf: $(DEPS)
 .PHONY: lint
 lint:
 ifndef GOLINT
-	$(error "Please install golint! go get -u github.com/tool/lint")
+	$(error "Please install golangci-lint! http://golangci-lint.run")
 endif
 ifndef INEFFASSIGN
-	$(error "Please install ineffassign! go get -u github.com/gordonklaus/ineffassign")
+	$(error "Please install ineffassign! go install github.com/gordonklaus/ineffassign@latest")
 endif
-	@echo "+ $@: golint, gofmt, go vet, ineffassign"
-	# golint
-	@test -z "$(shell find . -type f -name "*.go" -not -path "./vendor/*" -exec golint {} \; | tee /dev/stderr)"
+	@echo "+ $@: golangci-lint, gofmt, go vet, ineffassign"
+	# golangci-lint
+	@test -z "$$(golangci-lint run ./... | tee /dev/stderr)"
 	# gofmt
 	@test -z "$$(gofmt -s -l .| grep -v .pb. | grep -v vendor/ | tee /dev/stderr)"
 ifeq ($(GOOS),)
 	# govet
 	@test -z "$$(go tool vet -printf=false . 2>&1 | grep -v vendor/ | tee /dev/stderr)"
 endif
 	# ineffassign
-	@test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -exec ineffassign {} \; | tee /dev/stderr)
+	@test -z $$(ineffassign ./... | tee /dev/stderr)
 
 .PHONY: install-deps
 install-deps:
-	go get -u github.com/tool/lint
-	go get -u github.com/gordonklaus/ineffassign
+	go install github.com/golangci/golangci-lint/cmd/[email protected]
+	go install github.com/gordonklaus/ineffassign@latest
 
 .PHONY: test
 test: rtf lint

Makefile

@@ -1,3 +1,4 @@
+//go:build !linux && !darwin && !windows
 // +build !linux,!darwin,!windows
 
 package sysinfo