all repos — searchix @ 1a5c82e2d08accb6330c4164ab987b87157b10ed

Search engine for NixOS, nix-darwin, home-manager and NUR users

build: bake git hash into build for headers and --version

Alan Pearce
commit

1a5c82e2d08accb6330c4164ab987b87157b10ed

parent

f08094f23aa4dc7d63a7c98b4429d88005fe3a2d

1 file changed, 14 insertions(+), 0 deletions(-)

changed files
M internal/server/mux.go → internal/server/mux.go
@@ -35,6 +35,11 @@ }
 
 const jsSnippet = template.HTML(livereload.JsSnippet) // #nosec G203
 
+type VersionInfo struct {
+	ShortSHA  string
+	CommitSHA string
+}
+
 type TemplateData struct {
 	Sources       map[string]*config.Source
 	Source        config.Source

@@ -42,6 +47,7 @@ Query         string
 	Results       bool
 	SourceResult  *bleve.SearchResult
 	ExtraBodyHTML template.HTML
+	Version       VersionInfo
 }
 
 type ResultData[T options.NixOption] struct {

@@ -53,6 +59,11 @@ Prev           string
 	Next           string
 }
 
+var versionInfo = &VersionInfo{
+	ShortSHA:  config.ShortSHA,
+	CommitSHA: config.CommitSHA,
+}
+
 func applyDevModeOverrides(config *config.Config) {
 	if len(config.Web.ContentSecurityPolicy.ScriptSrc) == 0 {
 		config.Web.ContentSecurityPolicy.ScriptSrc = config.Web.ContentSecurityPolicy.DefaultSrc

@@ -93,6 +104,7 @@ mux.HandleFunc("/{$}", func(w http.ResponseWriter, _ *http.Request) {
 		indexData := TemplateData{
 			ExtraBodyHTML: config.Web.ExtraBodyHTML,
 			Sources:       config.Importer.Sources,
+			Version:       *versionInfo,
 		}
 		err := templates["index"].ExecuteTemplate(w, "index.gotmpl", indexData)
 		if err != nil {

@@ -140,6 +152,7 @@ TemplateData: TemplateData{
 					ExtraBodyHTML: config.Web.ExtraBodyHTML,
 					Source:        *source,
 					Sources:       config.Importer.Sources,
+					Version:       *versionInfo,
 				},
 				ResultsPerPage: search.ResultsPerPage,
 				Query:          qs,

@@ -200,6 +213,7 @@ ExtraBodyHTML: config.Web.ExtraBodyHTML,
 				Sources:       config.Importer.Sources,
 				Source:        *source,
 				SourceResult:  sourceResult,
+				Version:       *versionInfo,
 			})
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)