From 5c188d9dd45ea040c17caca572091f4f329c60a5 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sun, 18 Feb 2018 09:51:06 +0000 Subject: [PATCH] chore: go 1.10 and fix linters --- .circleci/config.yml | 7 ++++--- rice-box.go | 16 ++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f95836bb..8a5562b1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: linting: docker: - - image: circleci/golang:1.9 + - image: circleci/golang:1.10 working_directory: /go/src/github.com/filebrowser/filebrowser steps: - checkout @@ -16,6 +16,7 @@ jobs: name: Run linting command: | gometalinter --exclude="rice-box.go" \ + --deadline=300s \ -D goconst \ -D gocyclo \ -D vetshadow \ @@ -24,7 +25,7 @@ jobs: -D gas build: docker: - - image: circleci/golang:1.9 + - image: circleci/golang:1.10 working_directory: /go/src/github.com/filebrowser/filebrowser steps: - checkout @@ -38,7 +39,7 @@ jobs: command: go build deploy: docker: - - image: circleci/golang:1.9 + - image: circleci/golang:1.10 working_directory: /go/src/github.com/filebrowser/filebrowser steps: - checkout diff --git a/rice-box.go b/rice-box.go index bf6bef64..26f3e450 100644 --- a/rice-box.go +++ b/rice-box.go @@ -127,7 +127,7 @@ func init() { // define dirs dir1 := &embedded.EmbeddedDir{ Filename: "", - DirModTime: time.Unix(1517701204, 0), + DirModTime: time.Unix(1518947465, 0), ChildFiles: []*embedded.EmbeddedFile{ file2, // "index.html" fileu, // "sw.js" @@ -136,7 +136,7 @@ func init() { } dir3 := &embedded.EmbeddedDir{ Filename: "static", - DirModTime: time.Unix(1517701204, 0), + DirModTime: time.Unix(1518947465, 0), ChildFiles: []*embedded.EmbeddedFile{ fileq, // "static/manifest.json" @@ -144,7 +144,7 @@ func init() { } dir4 := &embedded.EmbeddedDir{ Filename: "static/css", - DirModTime: time.Unix(1517701204, 0), + DirModTime: time.Unix(1518947464, 0), ChildFiles: []*embedded.EmbeddedFile{ file5, // "static/css/app.75a7f41b85cdb16097dd425ffc55c1f5.css" @@ -152,12 +152,12 @@ func init() { } dir6 := &embedded.EmbeddedDir{ Filename: "static/img", - DirModTime: time.Unix(1517701204, 0), + DirModTime: time.Unix(1518947464, 0), ChildFiles: []*embedded.EmbeddedFile{}, } dir7 := &embedded.EmbeddedDir{ Filename: "static/img/icons", - DirModTime: time.Unix(1517701204, 0), + DirModTime: time.Unix(1518947464, 0), ChildFiles: []*embedded.EmbeddedFile{ file8, // "static/img/icons/android-chrome-192x192.png" file9, // "static/img/icons/android-chrome-512x512.png" @@ -177,7 +177,7 @@ func init() { } dirl := &embedded.EmbeddedDir{ Filename: "static/js", - DirModTime: time.Unix(1517701204, 0), + DirModTime: time.Unix(1518947465, 0), ChildFiles: []*embedded.EmbeddedFile{ filem, // "static/js/app.e8697d002882976987f8.js" filen, // "static/js/app.e8697d002882976987f8.js.map" @@ -188,7 +188,7 @@ func init() { } dirr := &embedded.EmbeddedDir{ Filename: "static/share", - DirModTime: time.Unix(1517701204, 0), + DirModTime: time.Unix(1518947465, 0), ChildFiles: []*embedded.EmbeddedFile{ files, // "static/share/404.html" filet, // "static/share/index.html" @@ -220,7 +220,7 @@ func init() { // register embeddedBox embedded.RegisterEmbeddedBox(`./node_modules/filebrowser-frontend/dist`, &embedded.EmbeddedBox{ Name: `./node_modules/filebrowser-frontend/dist`, - Time: time.Unix(1517701204, 0), + Time: time.Unix(1518947465, 0), Dirs: map[string]*embedded.EmbeddedDir{ "": dir1, "static": dir3,