From 092ef6185f59600294cd6a238b34c8f7d092d09e Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 1 Nov 2026 13:59:26 -0500 Subject: [PATCH] better versioning --- AGENTS.md | 4 ++++ flake.nix | 5 ++++- slackerbot/main.go | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/AGENTS.md b/AGENTS.md index 9a5f9b1..5aaef24 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -7,6 +7,10 @@ Rules for anyone, human or AI, changing this repo. Read [ARCHITECTURE.md](ARCHIT - `nix develop` (or direnv with `.envrc`) gives Go, gopls, staticcheck, delve and btrfs-progs. Use it rather than system tools. - Go code lives in `slackerbot/`, and that's where `go` commands run. Nix files and docs live at the repo root. +## Versioning + +Versions look like `YYYY.MM.DD-`. `flake.nix` builds the string from the commit date and short rev (with `-dirty` for uncommitted trees) and passes it to the binary with `-X main.version`. Don't hardcode a version anywhere. `slackerbot -version` prints it, and a plain `go build` reports `dev`. + ## Checks before you finish Run from `slackerbot/`, and all must pass: diff --git a/flake.nix b/flake.nix index 81b0142..1883359 100644 --- a/flake.nix +++ b/flake.nix @@ -8,13 +8,16 @@ system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; agent = self.nixosConfigurations.agent.config.system.build.toplevel; + date = self.lastModifiedDate; + version = "${builtins.substring 0 4 date}.${builtins.substring 4 2 date}.${builtins.substring 6 2 date}-${self.shortRev or self.dirtyShortRev or "dirty"}"; in { packages.${system} = { slackerbot = pkgs.buildGoModule { pname = "slackerbot"; - version = "0.1.0"; + inherit version; src = ./slackerbot; + ldflags = [ "-X main.version=${version}" ]; vendorHash = "sha256-DFNUnPMsfcUHDlIxcxsDvuqjoHcp9EDTXWVy5t/oxEk="; # tests need network ports and ../config.example.toml doCheck = false; diff --git a/slackerbot/main.go b/slackerbot/main.go index 6b501f4..e6e0a07 100644 --- a/slackerbot/main.go +++ b/slackerbot/main.go @@ -3,6 +3,7 @@ package main import ( "context" "flag" + "fmt" "log" "os" "os/signal" @@ -16,11 +17,20 @@ import ( "slackerbot/internal/state" ) +var version = "dev" + func main() { cfgPath := flag.String("config", "/etc/slackerbot/config.toml", "path to the config file") mode := flag.String("mode", config.ModeMaster, "master (runs the Slack bot) or slave (runs containers for a master)") + showVersion := flag.Bool("version", false, "print the version and exit") flag.Parse() + if *showVersion { + fmt.Println(version) + return + } + log.Printf("slackerbot %s", version) + cfg, err := config.LoadConfig(*cfgPath, *mode) if err != nil { log.Fatal(err)