From 998dd9430dcd8f8b83af0c590f8f5a3924b4a186 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Fri, 28 Dec 2018 19:19:54 +0000 Subject: [PATCH] fix: move everything to LF (#588) * fix: move everything to LF License: MIT Signed-off-by: Henrique Dias * feat: metalinter License: MIT Signed-off-by: Henrique Dias Former-commit-id: 3e371bf0dc4d8205fd2ab4d1b64328b7659242c0 [formerly 5c776eafad1350b9f55b3417bf63f51d372e1663] [formerly ef8552957375306c1ab58db6cead3fdf92bc1758 [formerly b344efef2dd9171ecbf10f0f19229a408dda0bae]] Former-commit-id: b8e19acffb00ef1546a7005b1956a858038199f2 [formerly 2b9920caa1bf71b44f245ee3d246b41170f5aecf] Former-commit-id: 36c7a82150c1ca5d528aeb7aadae243661966560 --- .dockerignore | 6 +-- .gometalinter.json | 68 +++++++++++++------------- .goreleaser.yml | 118 ++++++++++++++++++++++----------------------- build/build_all.sh | 2 - 4 files changed, 96 insertions(+), 98 deletions(-) diff --git a/.dockerignore b/.dockerignore index e58dfc40..8767564e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,3 @@ -testdata/ -.github/ -**.git +testdata/ +.github/ +**.git diff --git a/.gometalinter.json b/.gometalinter.json index 638f67c5..ac903f42 100644 --- a/.gometalinter.json +++ b/.gometalinter.json @@ -1,38 +1,38 @@ { "Enable": [ - "deadcode", - "gotype", - "gotypex", - "ineffassign", - "interfacer", - "maligned", - "megacheck", - "structcheck", - "unconvert", - "varcheck", - "vet" - ], + "deadcode", + "gotype", + "gotypex", + "ineffassign", + "interfacer", + "maligned", + "megacheck", + "structcheck", + "unconvert", + "varcheck", + "vet" + ], "Disable": [ - "dupl", - "errcheck", - "gochecknoglobals", - "gochecknoinits", - "goconst", - "gocyclo", - "gofmt", - "goimports", - "golint", - "gosec", - "gosimple", - "lll", - "misspell", - "nakedret", - "safesql", - "staticcheck", - "test", - "testify", - "unparam", - "unused", - "vetshadow" - ] + "dupl", + "errcheck", + "gochecknoglobals", + "gochecknoinits", + "goconst", + "gocyclo", + "gofmt", + "goimports", + "golint", + "gosec", + "gosimple", + "lll", + "misspell", + "nakedret", + "safesql", + "staticcheck", + "test", + "testify", + "unparam", + "unused", + "vetshadow" + ] } diff --git a/.goreleaser.yml b/.goreleaser.yml index 11518fb4..8b69c4fb 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,59 +1,59 @@ -project_name: filebrowser - -build: - env: - - CGO_ENABLED=0 - main: cli/main.go - binary: filebrowser - goos: - - darwin - - linux - - windows - - freebsd - - netbsd - - openbsd - - dragonfly - - solaris - goarch: - - amd64 - - 386 - - arm - - arm64 - goarm: - - 5 - - 6 - - 7 - ignore: - - goos: darwin - goarch: 386 - - goos: openbsd - goarch: arm - - goos: freebsd - goarch: arm - - goos: netbsd - goarch: arm - - goos: solaris - goarch: arm - -archive: - name_template: "{{.Os}}-{{.Arch}}{{if .Arm}}v{{.Arm}}{{end}}-{{ .ProjectName }}" - format: tar.gz - format_overrides: - - goos: windows - format: zip - -release: - disable: true - -dockers: - - - goos: linux - goarch: amd64 - goarm: '' - image: filebrowser/filebrowser - skip_push: true - tag_templates: - - "{{ .Tag }}" - - latest - extra_files: - - Docker.json +project_name: filebrowser + +build: + env: + - CGO_ENABLED=0 + main: cli/main.go + binary: filebrowser + goos: + - darwin + - linux + - windows + - freebsd + - netbsd + - openbsd + - dragonfly + - solaris + goarch: + - amd64 + - 386 + - arm + - arm64 + goarm: + - 5 + - 6 + - 7 + ignore: + - goos: darwin + goarch: 386 + - goos: openbsd + goarch: arm + - goos: freebsd + goarch: arm + - goos: netbsd + goarch: arm + - goos: solaris + goarch: arm + +archive: + name_template: "{{.Os}}-{{.Arch}}{{if .Arm}}v{{.Arm}}{{end}}-{{ .ProjectName }}" + format: tar.gz + format_overrides: + - goos: windows + format: zip + +release: + disable: true + +dockers: + - + goos: linux + goarch: amd64 + goarm: '' + image: filebrowser/filebrowser + skip_push: true + tag_templates: + - "{{ .Tag }}" + - latest + extra_files: + - Docker.json diff --git a/build/build_all.sh b/build/build_all.sh index e8954ac8..2540748c 100755 --- a/build/build_all.sh +++ b/build/build_all.sh @@ -25,8 +25,6 @@ if [ "$USE_DOCKER" != "" ]; then filebrowser/dev \ sh -c "\ cd build && \ - dos2unix build_assets.sh && \ - dos2unix build.sh && \ ./build_assets.sh && \ ./build.sh \ "