diff options
| author | zeripath <art27@cantab.net> | 2020-01-27 01:05:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-27 01:05:38 +0000 |
| commit | 48abe41ea82f88235bd6a6a66f6a2d1701215b84 (patch) | |
| tree | c4b42644f047f3f09314acd034f283f3804d2f68 /modules/options | |
| parent | d087f4fb735d860a394baf709f4cac5b945f9287 (diff) | |
| download | gitea-48abe41ea82f88235bd6a6a66f6a2d1701215b84.tar.gz gitea-48abe41ea82f88235bd6a6a66f6a2d1701215b84.zip | |
Generate Bindata iff TAGS="bindata" and not up-to-date (#10004)
* Only generate bindata if necessary
* Only generate bindata if they are not up-to-date
* generate a hash of the fileinfo and use that to keep up-to-date
* Newer test is redundant
* handle missing bindata and clean
* Only update hash after successful write
* switch to sha1 hash
* Apply suggestions from code review
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'modules/options')
| -rw-r--r-- | modules/options/main.go | 23 | ||||
| -rw-r--r-- | modules/options/options.go | 2 | ||||
| -rw-r--r-- | modules/options/options_bindata.go | 9 |
3 files changed, 9 insertions, 25 deletions
diff --git a/modules/options/main.go b/modules/options/main.go deleted file mode 100644 index 0bc6c04e24..0000000000 --- a/modules/options/main.go +++ /dev/null @@ -1,23 +0,0 @@ -// +build ignore - -package main - -import ( - "log" - "net/http" - - "github.com/shurcooL/vfsgen" -) - -func main() { - var fsTemplates http.FileSystem = http.Dir("../../options") - err := vfsgen.Generate(fsTemplates, vfsgen.Options{ - PackageName: "options", - BuildTags: "bindata", - VariableName: "Assets", - Filename: "bindata.go", - }) - if err != nil { - log.Fatal("%v", err) - } -} diff --git a/modules/options/options.go b/modules/options/options.go index 62e8c041bd..6ba3bd6a86 100644 --- a/modules/options/options.go +++ b/modules/options/options.go @@ -4,8 +4,6 @@ package options -//go:generate go run -mod=vendor main.go - type directorySet map[string][]string func (s directorySet) Add(key string, value []string) { diff --git a/modules/options/options_bindata.go b/modules/options/options_bindata.go new file mode 100644 index 0000000000..a5143c1fff --- /dev/null +++ b/modules/options/options_bindata.go @@ -0,0 +1,9 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +//+build bindata + +package options + +//go:generate go run -mod=vendor ../../scripts/generate-bindata.go ../../options options bindata.go |