From a3f02494487e33022dd486c48555a2e5a80def28 Mon Sep 17 00:00:00 2001 From: Egon Elbre Date: Thu, 16 Sep 2021 17:42:10 +0300 Subject: [PATCH] drcpserver: fix windows build Change-Id: Ia4d2d138ece4a5b6d736e5e72405960191ac9ff1 --- Jenkinsfile | 9 ++++++++- Makefile | 9 +++++++++ drpcserver/util_windows.go | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cae08a2..0c59c2c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,8 @@ pipeline { agent { docker { label 'main' - image docker.build("storj-ci", "--pull git://github.com/storj/ci.git#main").id + image 'storjlabs/ci:latest' + alwaysPull true args '-u root:root --cap-add SYS_PTRACE -v "/tmp/gomod":/go/pkg/mod' } } @@ -33,6 +34,12 @@ pipeline { sh 'make lint' } } + + stage('Vet') { + steps { + sh 'make vet' + } + } } post { diff --git a/Makefile b/Makefile index 45b5ecd..31109cd 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,15 @@ lint: .PHONY: vet vet: ./scripts/run.sh '*' go vet ./... + GOOS=linux GOARCH=386 ./scripts/run.sh '*' go vet ./... + GOOS=linux GOARCH=amd64 ./scripts/run.sh '*' go vet ./... + GOOS=linux GOARCH=arm ./scripts/run.sh '*' go vet ./... + GOOS=linux GOARCH=arm64 ./scripts/run.sh '*' go vet ./... + GOOS=windows GOARCH=386 ./scripts/run.sh '*' go vet ./... + GOOS=windows GOARCH=amd64 ./scripts/run.sh '*' go vet ./... + GOOS=windows GOARCH=arm64 ./scripts/run.sh '*' go vet ./... + GOOS=darwin GOARCH=amd64 ./scripts/run.sh '*' go vet ./... + GOOS=darwin GOARCH=arm64 ./scripts/run.sh '*' go vet ./... .PHONY: test test: diff --git a/drpcserver/util_windows.go b/drpcserver/util_windows.go index c5d7994..c3fb314 100644 --- a/drpcserver/util_windows.go +++ b/drpcserver/util_windows.go @@ -9,6 +9,7 @@ import ( "errors" "net" "os" + "syscall" ) const ( @@ -30,7 +31,7 @@ func isTemporary(err error) bool { } var sErr *os.SyscallError - if errors.As(nErr.Err, &sErr) { + if errors.As(err, &sErr) { switch sErr.Err { case _WSAENETRESET, _WSAEMFILE,