diff options
| author | Kyren223 <kyren223@proton.me> | 2025-07-30 20:34:33 +0300 |
|---|---|---|
| committer | Kyren223 <kyren223@proton.me> | 2025-07-30 20:34:33 +0300 |
| commit | e4e70382471ded52af4da1872d8544da0428d3a4 (patch) | |
| tree | 788617ec78720908b2dfba4b02850bd9ecdb9c88 | |
| parent | 82808bcaf70f510d1abcdff2da52822a0fef588c (diff) | |
Converted buildDate to unix to prevent cache invalidation due to impure
date
| -rw-r--r-- | cmd/client/main.go | 11 | ||||
| -rw-r--r-- | cmd/server/main.go | 14 | ||||
| -rw-r--r-- | flake.nix | 13 |
3 files changed, 21 insertions, 17 deletions
diff --git a/cmd/client/main.go b/cmd/client/main.go index 87e3d98..00baefb 100644 --- a/cmd/client/main.go +++ b/cmd/client/main.go @@ -20,6 +20,8 @@ import ( "fmt" "log" "os" + "strconv" + "time" "github.com/kyren223/eko/embeds" "github.com/kyren223/eko/internal/client" @@ -29,7 +31,14 @@ func main() { if len(os.Args) > 1 && os.Args[1] == "-v" { fmt.Println("version:", embeds.Version) fmt.Println("commit:", embeds.Commit) - fmt.Println("build date:", embeds.BuildDate) + buildDate := embeds.BuildDate + if buildDate != "unknown" { + t, err := strconv.ParseInt(buildDate, 10, 64) + if err == nil { + buildDate = time.Unix(t, 0).Format("2006-01-02") + } + } + fmt.Println("build date:", buildDate) return } diff --git a/cmd/server/main.go b/cmd/server/main.go index 8ee5674..db4a479 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -26,13 +26,10 @@ import ( "os" "os/signal" "path/filepath" + "strconv" "syscall" "time" - // "github.com/grafana/pyroscope-go" - // _ "github.com/grafana/pyroscope-go/godeltaprof/http/pprof" - // _ "net/http/pprof" - "github.com/kyren223/eko/embeds" "github.com/kyren223/eko/internal/server" "github.com/kyren223/eko/internal/server/api" @@ -55,7 +52,14 @@ func main() { if len(os.Args) > 1 && os.Args[1] == "-v" { fmt.Println("version:", embeds.Version) fmt.Println("commit:", embeds.Commit) - fmt.Println("build date:", embeds.BuildDate) + buildDate := embeds.BuildDate + if buildDate != "unknown" { + t, err := strconv.ParseInt(buildDate, 10, 64) + if err == nil { + buildDate = time.Unix(t, 0).Format("2006-01-02") + } + } + fmt.Println("build date:", buildDate) return } @@ -22,19 +22,10 @@ inherit system overlays; }; version = (builtins.readFile ./VERSION); - buildDate = builtins.readFile ( - pkgs.runCommand "build-date" { } '' - ${pkgs.coreutils}/bin/date --date=@${toString self.lastModified} +%Y-%m-%d -u > $out - '' - ); - # buildDate = builtins.readFile ( - # pkgs.runCommand "build-date" { } '' - # date -u +'%Y-%m-%d' > $out - # '' - # ); + buildDate = toString self.lastModified; commit = if (builtins.hasAttr "rev" self) then (builtins.substring 0 7 self.rev) else "unknown"; # vendorHash = pkgs.lib.fakeHash; - vendorHash = "sha256-2yCQ40T5N90lKpPOc+i6vz+1mI/p4Ey6PdRCJbGD+TE="; + vendorHash = "sha256-dLhLFyrufv3dNlAw1QLlf9/LsHMcUaD9F2byKlC+35E="; src = let # Set this to `true` in order to show all of the source files |