diff --git a/.gitattributes b/.gitattributes index 7769daa83..965a14636 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,4 +3,6 @@ README.md merge=union go.sum merge=union plugins/inputs/all/all.go merge=union plugins/outputs/all/all.go merge=union -**/testdata/** test eol=lf + +# Always check-out / check-in files with LF line endings. +* text=auto eol=lf diff --git a/Makefile b/Makefile index facf7c479..434d2c84e 100644 --- a/Makefile +++ b/Makefile @@ -115,9 +115,7 @@ build_tools: $(HOSTGO) build -o ./tools/readme_linter/readme_linter$(EXEEXT) ./tools/readme_linter embed_readme_%: - GOOS=linux go generate -run="readme_config_includer/generator$$" ./plugins/$*/... - GOOS=windows go generate -run="readme_config_includer/generator$$" ./plugins/$*/... - GOOS=darwin go generate -run="readme_config_includer/generator$$" ./plugins/$*/... + go generate -run="readme_config_includer/generator$$" ./plugins/$*/... .PHONY: config config: diff --git a/plugins/serializers/csv/csv_test.go b/plugins/serializers/csv/csv_test.go index fa27a2859..f4443c30a 100644 --- a/plugins/serializers/csv/csv_test.go +++ b/plugins/serializers/csv/csv_test.go @@ -83,6 +83,8 @@ func TestSerializeTransformationNonBatch(t *testing.T) { // Serialize serializer, err := NewSerializer(cfg.TimestampFormat, cfg.Separator, cfg.Header, cfg.Prefix) require.NoError(t, err) + // expected results use LF endings + serializer.writer.UseCRLF = false var actual bytes.Buffer for _, m := range metrics { buf, err := serializer.Serialize(m) @@ -149,6 +151,8 @@ func TestSerializeTransformationBatch(t *testing.T) { // Serialize serializer, err := NewSerializer(cfg.TimestampFormat, cfg.Separator, cfg.Header, cfg.Prefix) require.NoError(t, err) + // expected results use LF endings + serializer.writer.UseCRLF = false actual, err := serializer.SerializeBatch(metrics) require.NoError(t, err) diff --git a/tools/readme_config_includer/generator.go b/tools/readme_config_includer/generator.go index 966e20223..3bab216b6 100644 --- a/tools/readme_config_includer/generator.go +++ b/tools/readme_config_includer/generator.go @@ -54,7 +54,8 @@ func extractIncludeBlock(txt []byte, includesEx *regexp.Regexp, root string) *in } include := filepath.FromSlash(string(inc[1])) // Make absolute paths relative to the include-root if any - if filepath.IsAbs(include) { + // Check original value to avoid platform specific slashes + if filepath.IsAbs(string(inc[1])) { if root == "" { log.Printf("Ignoring absolute include %q without include root...", include) continue