Skip to content

Commit 0ca59bd

Browse files
committed
Even further speedup generate
The gendocs step used to always be run unconditionally, this now also uses make to detect changed source files.
1 parent f95422e commit 0ca59bd

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

rolling-shutter/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ test: test-unit
3838
test-all: test-unit test-integration
3939

4040
generate: install-codegen-tools
41-
${GO} generate -skip="gendocs.go" -x ./...
42-
${GO} generate -run="gendocs.go" -x ./...
41+
${GO} generate -skip="make docs" -x ./...
42+
${GO} generate -run="make docs" -x ./...
4343

4444
coverage:
4545
${GO} test ${GOFLAGS} -covermode=count -coverprofile=coverage.out ./...

rolling-shutter/docs/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
docs: rolling-shutter.md
2+
3+
rolling-shutter.md: ../medley/rootcmd/root.go $(shell find ../cmd -iname '*.go' ! -iname '*_test.go')
4+
go run gendocs.go

rolling-shutter/docs/docs.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package docs
2+
3+
//go:generate make docs

rolling-shutter/docs/gendocs.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd"
99
)
1010

11-
//go:generate go run gendocs.go
1211
func main() {
1312
err := doc.GenMarkdownTree(cmd.Command(), "./")
1413
if err != nil {

rolling-shutter/main.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import (
55
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/rootcmd"
66
)
77

8-
//go:generate go run -C docs gendocs.go
9-
108
func main() {
119
rootcmd.Main(cmd.Command())
1210
}

rolling-shutter/medley/rootcmd/root.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var (
2525
ArgNameLogformat string = "logformat"
2626
logLevelArg string
2727
ArgNameLoglevel string = "loglevel"
28-
reLogLevelConfig = regexp.MustCompile("^(?:(?P<logger>[\\w/._-]+)?:(?P<level>debug|info|warn(?:ing)?|error|fatal|panic),?)+$")
28+
reLogLevelConfig = regexp.MustCompile(`^(?:([\w/.-]+)?:(debug|info|warn(?:ing)?|error|fatal|panic),?)+$`)
2929
)
3030

3131
func configureCaller(l zerolog.Logger, short bool) zerolog.Logger {
@@ -116,9 +116,9 @@ func setupLogging() (zerolog.Logger, error) {
116116
return l, errors.Wrapf(err, "flag '%s' value '%s' not recognized", ArgNameLoglevel, logLevel)
117117
}
118118
zerolog.SetGlobalLevel(level)
119-
golog.SetLogLevel("*", levelName)
119+
_ = golog.SetLogLevel("*", levelName)
120120
} else {
121-
golog.SetLogLevel(loggerName, levelName)
121+
_ = golog.SetLogLevel(loggerName, levelName)
122122
}
123123
}
124124
}

0 commit comments

Comments
 (0)