github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

match go version in CI to version in go-compile

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher 2020-04-19 11:02:35 +03:00
parent a44ea341ca
commit fbe9b98d4d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci.yml vendored
View File

@ -16,10 +16,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up Go 1.11 - name: Set up Go 1.13
uses: actions/setup-go@v1 uses: actions/setup-go@v2
with: with:
go-version: 1.11 go-version: 1.13.4
id: go id: go
- name: Check out code - name: Check out code
@ -319,4 +319,4 @@ jobs:
- name: Run Tests - name: Run Tests
run: | run: |
cd test cd test
rtf -l build -v run -x linuxkit.security rtf -l build -v run -x linuxkit.security

2
Makefile
View File

@ -75,7 +75,7 @@ LOCAL_TARGET ?= $(LINUXKIT)
.PHONY: local-check local-build local-test local-static-pie local-static local-dynamic local .PHONY: local-check local-build local-test local-static-pie local-static local-dynamic local
local-check: $(LINUXKIT_DEPS) local-check: $(LINUXKIT_DEPS)
@echo gofmt... && o=$$(gofmt -s -l $(filter %.go,$(LINUXKIT_DEPS))) && if [ -n "$$o" ] ; then echo $$o ; exit 1 ; fi @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 golint... && set -e ; for i in $(filter %.go,$(LINUXKIT_DEPS)); do golint $$i ; done
@echo ineffassign... && ineffassign $(filter %.go,$(LINUXKIT_DEPS)) @echo ineffassign... && ineffassign $(filter %.go,$(LINUXKIT_DEPS))

4
src/cmd/linuxkit/gcp.go
View File

@ -477,7 +477,7 @@ func (g *GCPClient) pollOperationStatus(operationName string) error {
return fmt.Errorf("error fetching operation status: %v", err) return fmt.Errorf("error fetching operation status: %v", err)
} }
if operation.Error != nil { 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" { if operation.Status == "DONE" {
return nil return nil
@ -494,7 +494,7 @@ func (g *GCPClient) pollZoneOperationStatus(operationName, zone string) error {
return fmt.Errorf("error fetching operation status: %v", err) return fmt.Errorf("error fetching operation status: %v", err)
} }
if operation.Error != nil { 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" { if operation.Status == "DONE" {
return nil return nil