Skip to content

Commit

Permalink
Merge pull request #33 from urfave/windows-tests
Browse files Browse the repository at this point in the history
Failing linter job on Windows
  • Loading branch information
abitrolly authored Nov 12, 2024
2 parents 6911257 + a307f7b commit 2080286
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ensure Windows uses proper line endings
*.go text eol=lf
7 changes: 3 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ jobs:
strategy:
matrix:
go: [stable]
# disable windows-latest for now
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-latest, windows-latest]
name: lint
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -28,6 +27,6 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.60
version: v1.62
- name: run CI
run: make ci
run: make ci
6 changes: 4 additions & 2 deletions cmd/genvalues/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"os"
"os/exec"
"reflect"
"sort"
"strings"
"text/template"
"unicode"
Expand All @@ -26,8 +27,8 @@ const (
// This file is autogenerated by "go generate .". Do not modify.
import (
{{range .Imports}}
"{{.}}"{{end}}
{{- range .Imports}}
"{{.}}"{{end}}
)
{{$mapKeyTypes := .MapKeysTypes}}
Expand Down Expand Up @@ -538,6 +539,7 @@ func main() {
for _, value := range values {
imports = append(imports, value.Import...)
}
sort.Strings(imports)

baseT := template.New("genvalues").Funcs(template.FuncMap{
"Lower": strings.ToLower,
Expand Down

0 comments on commit 2080286

Please sign in to comment.