Fix CI on Windows

.gitattributes

@@ -1 +1,3 @@
 go.sum linguist-generated
+*     text=auto eol=lf
+*.ps1 text eol=crlf

.github/workflows/pr.yml

@@ -44,7 +44,6 @@ jobs:
           go-version: 1.15 # test only the latest go version to speed up CI
       - name: Run tests
         run: make.exe test
-        continue-on-error: true
   tests-on-macos:
     needs: golangci-lint # run after golangci-lint action to not produce duplicated errors
     runs-on: macos-latest

Makefile

@@ -4,17 +4,22 @@
 # enable consistent Go 1.12/1.13 GOPROXY behavior.
 export GOPROXY = https://proxy.golang.org
 
+BINARY = golangci-lint
+ifeq ($(OS),Windows_NT)
+	BINARY := $(BINARY).exe
+endif
+
 # Build
 
 build: golangci-lint
 .PHONY: build
 
 build_race:
-	go build -race -o golangci-lint ./cmd/golangci-lint
+	go build -race -o $(BINARY) ./cmd/golangci-lint
 .PHONY: build_race
 
 clean:
-	rm -f golangci-lint
+	rm -f $(BINARY)
 	rm -f test/path
 	rm -f tools/Dracula.itermcolors
 	rm -f tools/godownloader
@@ -26,12 +31,12 @@ clean:
 # Test
 test: export GOLANGCI_LINT_INSTALLED = true
 test: build
-	GL_TEST_RUN=1 ./golangci-lint run -v
+	GL_TEST_RUN=1 ./$(BINARY) run -v
 	GL_TEST_RUN=1 go test -v -parallel 2 ./...
 .PHONY: test
 
 test_race: build_race
-	GL_TEST_RUN=1 ./golangci-lint run -v --timeout=5m
+	GL_TEST_RUN=1 ./$(BINARY) run -v --timeout=5m
 .PHONY: test_race
 
 test_linters:
@@ -70,7 +75,7 @@ snapshot: .goreleaser.yml tools/goreleaser
 # Non-PHONY targets (real files)
 
 golangci-lint: FORCE
-	go build -o $@ ./cmd/golangci-lint
+	go build -o $(BINARY) ./cmd/golangci-lint
 
 tools/godownloader: export GOFLAGS = -mod=readonly
 tools/godownloader: tools/go.mod tools/go.sum

test/data.go

@@ -4,8 +4,9 @@ import (
 	"path/filepath"
 )
 
-const testdataDir = "testdata"
-const binName = "../golangci-lint"
+const (
+	testdataDir = "testdata"
+)
 
 var minimalPkg = getTestDataDir("minimalpkg")
 

test/linters_test.go

@@ -102,16 +102,17 @@ func TestGciLocal(t *testing.T) {
 func saveConfig(t *testing.T, cfg map[string]interface{}) (cfgPath string, finishFunc func()) {
 	f, err := ioutil.TempFile("", "golangci_lint_test")
 	assert.NoError(t, err)
+	name := f.Name()
+	assert.NoError(t, f.Close())
 
-	cfgPath = f.Name() + ".yml"
-	err = os.Rename(f.Name(), cfgPath)
+	cfgPath = name + ".yml"
+	err = os.Rename(name, cfgPath)
 	assert.NoError(t, err)
 
 	err = yaml.NewEncoder(f).Encode(cfg)
 	assert.NoError(t, err)
 
 	return cfgPath, func() {
-		assert.NoError(t, f.Close())
 		if os.Getenv("GL_KEEP_TEMP_FILES") != "1" {
 			assert.NoError(t, os.Remove(cfgPath))
 		}
@@ -154,7 +155,7 @@ func testOneSource(t *testing.T, sourcePath string) {
 
 		caseArgs = append(caseArgs, sourcePath)
 
-		cmd := exec.Command(binName, caseArgs...)
+		cmd := exec.Command(testshared.BinaryName(), caseArgs...)
 		t.Log(caseArgs)
 		runGoErrchk(cmd, []string{sourcePath}, t)
 	}

test/testshared/testshared.go

@@ -4,17 +4,27 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"path/filepath"
+	"runtime"
 	"strings"
 	"sync"
 	"syscall"
 	"time"
 
-	"github.com/stretchr/testify/assert"
+	assert "github.com/stretchr/testify/require"
 
 	"github.com/golangci/golangci-lint/pkg/exitcodes"
 	"github.com/golangci/golangci-lint/pkg/logutils"
 )
 
+func BinaryName() string {
+	name := filepath.Join("..", "golangci-lint")
+	if runtime.GOOS == "windows" {
+		name += ".exe"
+	}
+	return name
+}
+
 type LintRunner struct {
 	t           assert.TestingT
 	log         logutils.Log
@@ -96,10 +106,10 @@ func (r *LintRunner) RunCommand(command string, args ...string) *RunResult {
 
 	runArgs := append([]string{command}, args...)
 	defer func(startedAt time.Time) {
-		r.log.Infof("ran [../golangci-lint %s] in %s", strings.Join(runArgs, " "), time.Since(startedAt))
+		r.log.Infof("ran [%s %s] in %s", BinaryName(), strings.Join(runArgs, " "), time.Since(startedAt))
 	}(time.Now())
 
-	cmd := exec.Command("../golangci-lint", runArgs...)
+	cmd := exec.Command(BinaryName(), runArgs...)
 	cmd.Env = append(os.Environ(), r.env...)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
@@ -114,7 +124,11 @@ func (r *LintRunner) RunCommand(command string, args ...string) *RunResult {
 		}
 
 		r.t.Errorf("can't get error code from %s", err)
-		return nil
+		return &RunResult{
+			t:        r.t,
+			output:   err.Error(),
+			exitCode: -1,
+		}
 	}
 
 	// success, exitCode should be 0 if go is ok