Skip to content

Commit cce2bd7

Browse files
HadrienPattebimmlerd
authored andcommitted
gitattributes: Restore rST syntax highlighting for upgrade notes
The upgrade notes fragments cannot carry an `.rst` extension: Sphinx would then build them as standalone documents and fail on duplicate labels with the file that '.. include::'s them. This PR manually configures their Linguist language via `.gitattributes` which GitHub uses for syntax highlighting. This allows both keeping the current file names and restoring syntax highlighting. While at it, I also marked `vendor/modules.txt` as generated so that it gets collapsed like `go.sum` in PR diffs. Fixes: cilium#47218 Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
1 parent 7f6c983 commit cce2bd7

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/install/kubernetes/cilium/values.yaml linguist-generated
33
/install/kubernetes/cilium/README.md linguist-generated
44
go.sum linguist-generated
5+
vendor/modules.txt linguist-generated
56
examples/kubernetes/connectivity-check/connectivity-*.yaml linguist-generated
67
pkg/k8s/apis/cilium.io/v2/client/crds/*.yaml linguist-generated
78
test/controlplane/**/v1.[0-9][0-9]/*.yaml linguist-generated
@@ -19,6 +20,8 @@ pkg/k8s/client/informers/** linguist-generated
1920
pkg/k8s/client/listers/** linguist-generated
2021
*.bt linguist-language=D
2122
pkg/datapath/config/*_config.go linguist-generated
23+
Documentation/**/*.inc linguist-language=reStructuredText
24+
Documentation/**/*.rst.tmpl linguist-language=reStructuredText
2225

2326
# Merge driver configuration for specific paths
2427
# To set up these merge drivers locally, run:

0 commit comments

Comments
 (0)