Pin git tag using checksum of checkout content instead of commit hash

Make the build reproducible by removing the go buildid from output binary and adding \!debug option

Remove gofmt command from check() function

2 files changed, 9 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f6c5ccb23e2..ba5c4a218cb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
 pkgbase = dmarc-report-converter
 	pkgdesc = Convert DMARC reports from XML to human-readable formats
 	pkgver = 0.8.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/tierpod/dmarc-report-converter
 	arch = x86_64
 	license = MIT
 	makedepends = git
 	makedepends = go
 	depends = glibc
+	options = !debug
 	backup = etc/dmarc-report-converter/config.yml
-	source = dmarc-report-converter-0.8.0::git+https://github.com/tierpod/dmarc-report-converter#tag=e405a03c200733036bf7f7b859df82a379354448
+	source = dmarc-report-converter-0.8.0::git+https://github.com/tierpod/dmarc-report-converter.git#tag=v0.8.0
 	source = config.yml
 	source = dmarc-report-converter.service
 	source = dmarc-report-converter.timer
 	source = change-default-path-of-config-file.patch
-	b2sums = SKIP
+	b2sums = 0766cb2a7a5ec7a51a9e7f7081fc7277f4c2b7759bf57f0ab260f88438feedf389ff0965b10cff80df3b73dc200a6c819ed88e35fc8d45735477ff5d126ff74c
 	b2sums = 7047b02100027203d7c0978f1607f41b0bccdb79a8c4a8f59bcf4f89ff2d9b9903cb8c5060a295a12a9ebfe8a378163e4ae3c61ddb181f58a236489fb2a5eb47
 	b2sums = 47ea048087d075d030b087a577968d999c891437da0e43aa919eb2ce756885e614b1ef1fa31a96880e16f0a9d75b609c7e2d95c536feac9e59aa5aa3e6ffa3d6
 	b2sums = f60f37cacff1384b3b60236c13bd5303728f8f2aa22a561d8dbdb43020f0db47b89babcf30cafc4d9ce12783935b4c1c41507fa218cea61a3cca68a1d03b9852
diff --git a/PKGBUILD b/PKGBUILD
index be72981b4ae7..915f77754195 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
 
 pkgname=dmarc-report-converter
 pkgver='0.8.0'
-pkgrel=1
+pkgrel=2
 pkgdesc='Convert DMARC reports from XML to human-readable formats'
 arch=('x86_64')
 url='https://github.com/tierpod/dmarc-report-converter'
 license=('MIT')
 depends=('glibc')
 makedepends=('git' 'go')
-_tag=e405a03c200733036bf7f7b859df82a379354448 # git rev-parse "v$pkgver"
-source=("${pkgname}-${pkgver}::git+https://github.com/tierpod/dmarc-report-converter#tag=$_tag"
+options=('!debug')
+source=("${pkgname}-${pkgver}::git+https://github.com/tierpod/dmarc-report-converter.git#tag=v${pkgver}"
         'config.yml'
         'dmarc-report-converter.service'
         'dmarc-report-converter.timer'
         'change-default-path-of-config-file.patch')
-b2sums=('SKIP'
+b2sums=('0766cb2a7a5ec7a51a9e7f7081fc7277f4c2b7759bf57f0ab260f88438feedf389ff0965b10cff80df3b73dc200a6c819ed88e35fc8d45735477ff5d126ff74c'
         '7047b02100027203d7c0978f1607f41b0bccdb79a8c4a8f59bcf4f89ff2d9b9903cb8c5060a295a12a9ebfe8a378163e4ae3c61ddb181f58a236489fb2a5eb47'
         '47ea048087d075d030b087a577968d999c891437da0e43aa919eb2ce756885e614b1ef1fa31a96880e16f0a9d75b609c7e2d95c536feac9e59aa5aa3e6ffa3d6'
         'f60f37cacff1384b3b60236c13bd5303728f8f2aa22a561d8dbdb43020f0db47b89babcf30cafc4d9ce12783935b4c1c41507fa218cea61a3cca68a1d03b9852'
@@ -41,7 +41,7 @@ build() {
     -buildmode=pie \
     -mod=vendor \
     -modcacherw \
-    -ldflags="-linkmode=external -X main.version=${pkgver}" \
+    -ldflags="-linkmode=external -X main.version=${pkgver} -buildid=" \
     -o dist/ \
     ./cmd/...
 }
@@ -49,8 +49,6 @@ build() {
 check() {
   cd "${pkgname}-${pkgver}"
 
-  find ./cmd ./pkg -type f -name '*.go' | xargs gofmt -l -e
-
   go vet -mod=vendor ./cmd/... ./pkg/...
   go test -mod=vendor ./cmd/... ./pkg/...
 }