raised version to 3.6.0

Signed-off-by: Jörg Horchler <joerg@horchler.xyz>

2 files changed, 25 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b3dd45d4df9..6fc29fadcb6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gotask-taskfile
 	pkgdesc = A task runner / simpler Make alternative written in Go. Installs as gtask to allow coexistance with taskwarrior.
-	pkgver = 3.5.0
+	pkgver = 3.6.0
 	pkgrel = 1
 	url = https://taskfile.dev/
 	arch = x86_64
@@ -12,7 +12,7 @@ pkgbase = gotask-taskfile
 	makedepends = git
 	provides = gotask-taskfile
 	conflicts = gotask-taskfile
-	source = gotask-taskfile-3.5.0::git://github.com/go-task/task#tag=v3.5.0
+	source = gotask-taskfile-3.6.0::git://github.com/go-task/task#tag=v3.6.0
 	md5sums = SKIP
 
 pkgname = gotask-taskfile
diff --git a/PKGBUILD b/PKGBUILD
index aa52517763ca..615447100e8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gotask-taskfile
 _binname=gtask
-pkgver=3.5.0
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="A task runner / simpler Make alternative written in Go. Installs as gtask to allow coexistance with taskwarrior."
 arch=('x86_64' 'i686' 'aarch64' 'armv7h')
@@ -14,29 +14,39 @@ makedepends=('go' 'git')
 source=("${pkgname}-${pkgver}::git://github.com/go-task/task#tag=v${pkgver}")
 md5sums=('SKIP')
 
-prepare(){
-  cd "$pkgname-$pkgver"
-  mkdir -p build/
-}
-
 build() {
-  cd "$pkgname-$pkgver"
+
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
-  go build -o build/${_binname} ./cmd/...
-}
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -modcacherw"
 
-check() {
   cd "$pkgname-$pkgver"
-  go test ./...
+  _modname=$(awk '$1 == "module" {print $2}' go.mod)
+  _mainpath=$(awk '$1 == "main:" {print $2}' .goreleaser.yml)
+  _gobinname=$(awk '$1 == "binary:" {print $2}' .goreleaser.yml)
+  export _gobinname
+
+  mkdir -p build/
+  cd build
+
+  echo "// +build: main" > main.go
+  echo "package main" >> main.go
+  echo "" >> main.go
+  echo "import _ \"${_modname}/${_mainpath}\"" >> main.go
+
+  echo "module ${_gobinname}" > go.mod
+  echo "" >> go.mod
+  echo "require ${_modname} v${pkgver}" >> go.mod
+
+  go mod tidy
+  go build -v -o ${_gobinname} -ldflags="-w -s -linkmode=external" ${_modname}/${_mainpath}
 }
 
 package() {
   cd "$pkgname-$pkgver"
-  install -Dm755 build/${_binname} "${pkgdir}/usr/bin/${_binname}"
+  install -Dm755 build/${_gobinname} "${pkgdir}/usr/bin/${_binname}"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -Dm644 CHANGELOG.md "${pkgdir}/usr/share/doc/${pkgname}/CHANGELOG.md"
   install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"