Set version information at buildHEADmaster

3 files changed, 54 insertions, 6 deletions

diff --git a/0001-Update-directories-fig-searches.patch b/0001-Update-directories-fig-searches.patch
index b45990e..1172d5e 100644
--- a/0001-Update-directories-fig-searches.patch
+++ b/0001-Update-directories-fig-searches.patch
@@ -1,7 +1,7 @@
 From 0d47544d12656be9eb853f8323f0da19eec2316c Mon Sep 17 00:00:00 2001
 From: Leonardo Bishop <me@leonardobishop.net>
 Date: Thu, 7 Aug 2025 12:00:20 +0100
-Subject: [PATCH] Update directories fig searches
+Subject: [PATCH 1/2] Update directories fig searches
 
 ---
  walrss/internal/state/state.go | 23 ++++++++++-------------
diff --git a/0002-Set-version-information-at-build.patch b/0002-Set-version-information-at-build.patch
new file mode 100644
index 0000000..c4aa677
--- /dev/null
+++ b/0002-Set-version-information-at-build.patch
@@ -0,0 +1,40 @@
+From f38b2c15ae796ade9f9779974dc5c237597b0829 Mon Sep 17 00:00:00 2001
+From: Leonardo Bishop <me@leonardobishop.net>
+Date: Thu, 7 Aug 2025 18:00:34 +0100
+Subject: [PATCH 2/2] Set version information at build
+
+---
+ Makefile                        | 6 +++++-
+ walrss/internal/core/version.go | 2 +-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 93f2b71..a3300fb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,12 @@
+ .PHONY: dockerBuild
+ 
++VERSION := $(shell git describe --tags --abbrev=7 | sed "s/^v//")
++
++all: build
++
+ build: templates
+ 	mkdir -p bin
+-	go build -o bin/walrss github.com/codemicro/walrss/walrss
++	go build -ldflags "-X 'github.com/codemicro/walrss/walrss/internal/core.Version=${VERSION}'" -o bin/walrss github.com/codemicro/walrss/walrss
+ 
+ run: build
+ 	mkdir -p run
+diff --git a/walrss/internal/core/version.go b/walrss/internal/core/version.go
+index 0b535ea..00a83ad 100644
+--- a/walrss/internal/core/version.go
++++ b/walrss/internal/core/version.go
+@@ -1,3 +1,3 @@
+ package core
+ 
+-const Version = ""
++var Version = ""
+-- 
+2.50.1
+
diff --git a/PKGBUILD b/PKGBUILD
index ee041f4..9fb27d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _pkgname=walrss
 pkgname="${_pkgname}-git"
 pkgdesc="Email-based RSS digest generator"
 pkgver=0.4.4.r1.g1c542bd
-pkgrel=1
+pkgrel=6
 makedepends=('go' 'make' 'git')
 arch=('x86_64')
 url="https://github.com/codemicro/walrss"
@@ -14,14 +14,19 @@ source=(walrss::git+https://github.com/codemicro/walrss
   walrss.service
   walrss.sysusers
   walrss.conf
+  config.yaml
   0001-Update-directories-fig-searches.patch
-  config.yaml)
+  0002-Set-version-information-at-build.patch
+  )
 sha256sums=('SKIP'
             '8b87e2f23d06e0a81fb747dccbd5d11b971ac298803d3aadfdf2623b4efc269e'
             '662f0df2e8025034d395e15726883bb009af89ec02aa3a198fd40d792a5c4ace'
             'd3fdc459dd3c712da5ec62213ef15d8d5d7ad2335bffbb277fc8eac66fd2cd79'
-            '9943f9c4eafa25647f38c20ae5e929f1bbc0d6771cb7f24f135e34bf4fdb52e0'
-            '2eeefbed0bb7a4936c020e85ad3fed21cf598fab14900c8149ca9bb87f4516b3')
+            '2eeefbed0bb7a4936c020e85ad3fed21cf598fab14900c8149ca9bb87f4516b3'
+            'cd1ef7762f3ad8889d1e52cebccf42d58080ca42bde60f876a1623d34771e7c4'
+            '188dbd12403db528b5a84df86b38ffe5ad0cb1ed20b7d8ecbfed4501b44c0f36')
+backup=(etc/walrss/config.yaml
+        etc/conf.d/walrss)
 
 pkgver() {
   cd "walrss"
@@ -31,8 +36,11 @@ pkgver() {
 prepare() {
   export GOPATH="$srcdir/build"
 
+  for patch in *.patch
+  do
+    patch -p1 -d "walrss" < "$srcdir/$patch"
+  done
   cd "walrss"
-  git apply "$srcdir/0001-Update-directories-fig-searches.patch"
   go mod download
   go install github.com/valyala/quicktemplate/qtc@latest
 }