diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f086e45d..3b82726f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,10 +16,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.11 - uses: actions/setup-go@v1 + - name: Set up Go 1.13 + uses: actions/setup-go@v2 with: - go-version: 1.11 + go-version: 1.13.4 id: go - name: Check out code @@ -319,4 +319,4 @@ jobs: - name: Run Tests run: | cd test - rtf -l build -v run -x linuxkit.security \ No newline at end of file + rtf -l build -v run -x linuxkit.security diff --git a/Makefile b/Makefile index ef9448b83..f69714e00 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ LOCAL_TARGET ?= $(LINUXKIT) .PHONY: local-check local-build local-test local-static-pie local-static local-dynamic local local-check: $(LINUXKIT_DEPS) @echo gofmt... && o=$$(gofmt -s -l $(filter %.go,$(LINUXKIT_DEPS))) && if [ -n "$$o" ] ; then echo $$o ; exit 1 ; fi - @echo govet... && go tool vet -printf=false $(filter %.go,$(LINUXKIT_DEPS)) + @echo govet... && go vet -printf=false ./src/cmd/linuxkit/... @echo golint... && set -e ; for i in $(filter %.go,$(LINUXKIT_DEPS)); do golint $$i ; done @echo ineffassign... && ineffassign $(filter %.go,$(LINUXKIT_DEPS)) diff --git a/src/cmd/linuxkit/gcp.go b/src/cmd/linuxkit/gcp.go index f8d0fa633..ef2238f64 100644 --- a/src/cmd/linuxkit/gcp.go +++ b/src/cmd/linuxkit/gcp.go @@ -477,7 +477,7 @@ func (g *GCPClient) pollOperationStatus(operationName string) error { return fmt.Errorf("error fetching operation status: %v", err) } if operation.Error != nil { - return fmt.Errorf("error running operation: %s", operation.Error) + return fmt.Errorf("error running operation: %v", operation.Error) } if operation.Status == "DONE" { return nil @@ -494,7 +494,7 @@ func (g *GCPClient) pollZoneOperationStatus(operationName, zone string) error { return fmt.Errorf("error fetching operation status: %v", err) } if operation.Error != nil { - return fmt.Errorf("error running operation: %s", operation.Error) + return fmt.Errorf("error running operation: %v", operation.Error) } if operation.Status == "DONE" { return nil