drcpserver: fix windows build

Change-Id: Ia4d2d138ece4a5b6d736e5e72405960191ac9ff1
storj · Sep 16, 2021 · a3f0249 · a3f0249
1 parent 885db27
commit a3f0249
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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,