1 files changed, 10 insertions(+), 20 deletions(-)

M sr.ht/grafana/APKBUILD

@@ 1,22 1,19 @@
 # Contributor: Konstantin Kulikov <k.kulikov2@gmail.com>
 # Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com>
 pkgname=grafana
-pkgver=6.5.0
+pkgver=6.5.2
 pkgrel=0
-_commit=24a5d2fe8b # git rev-parse --short HEAD
-_stamp=1574679696 # git --no-pager show -s --format=%ct
+_commit=742d165968 # git rev-parse --short HEAD
+_stamp=1576068086 # git --no-pager show -s --format=%ct
 pkgdesc="Open source, feature rich metrics dashboard and graph editor"
 url="https://grafana.com"
 arch="x86_64" # Builds are slow on arm archs, x86 requires python2.
 license="Apache-2.0"
 makedepends="go nodejs yarn"
-options="chmod-clean" # Can be replaced with -modcacherw in go1.14
 install="$pkgname.pre-install"
 subpackages="$pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/grafana/grafana/archive/v$pkgver.tar.gz
-	go.mod go.sum apk.go $pkgname.initd $pkgname.confd"
-builddir=$srcdir
-options="!check" # Upstream will be given tests when they learn how to use them responsibly
+	$pkgname.initd $pkgname.confd"
 
 export GOPATH=${GOPATH:-$srcdir/go}
 export GOCACHE=${GOCACHE:-$srcdir/go-build}


@@ 28,11 25,8 @@ export GOTMPDIR=${GOTMPDIR:-$srcdir}
 
 build() {
 	local ldflags="-X main.version=$pkgver -X main.commit=$_commit -X main.buildstamp=$_stamp"
-	for pkg in $(go list -f '{{ join .Imports " " }}'); do
-		go build -ldflags "$ldflags" -mod=readonly -v $pkg
-	done
-
-	cd $builddir/$pkgname-$pkgver
+	go build -ldflags "$ldflags" -mod=vendor -v github.com/grafana/grafana/pkg/cmd/grafana-server
+	go build -ldflags "$ldflags" -mod=vendor -v github.com/grafana/grafana/pkg/cmd/grafana-cli
 
 	# Don't pollute our git repo with grafanas commit hooks.
 	# Also don't try to install phantomjs since it depends on glibc.


@@ 45,8 39,7 @@ build() {
 }
 
 check() {
-	# Skipped tests do not work in module mode.
-	go test $(go list github.com/grafana/grafana/pkg/... | grep -Ev '(provisioning/dashboards)|(infra/log)|(grafana-cli/commands)')
+	go test -mod=vendor ./...
 }
 
 package() {


@@ 54,14 47,11 @@ package() {
 	install -Dm644 "$srcdir/$pkgname.confd" "$pkgdir/etc/conf.d/$pkgname"
 	install -Dm755 "$builddir/$pkgname-server" "$pkgdir/usr/sbin/$pkgname-server"
 	install -Dm755 "$builddir/$pkgname-cli" "$pkgdir/usr/bin/$pkgname-cli"
-	install -Dm644 "$builddir/$pkgname-$pkgver/conf/sample.ini" "$pkgdir/etc/grafana.ini"
+	install -Dm644 "$builddir/conf/sample.ini" "$pkgdir/etc/grafana.ini"
 	install -dm755 "$pkgdir/usr/share/grafana"
-	cp -r "$builddir/$pkgname-$pkgver/conf" "$builddir/$pkgname-$pkgver/public" "$pkgdir/usr/share/$pkgname/"
+	cp -r "$builddir/conf" "$builddir/public" "$pkgdir/usr/share/$pkgname/"
 }
 
-sha512sums="ba13149485f6b4a4d1de9740a33d46377c694e321d2a5d26bcbf452cad3a91cda54e9979a9aa112318918ae7c011ce1b47cb797bd01e481c506a9a81d1299f5e  grafana-6.5.0.tar.gz
-ee3e915c75aad9b80218f98c47eef418a5655a7dd4d7b3f6b1923aaca13a065b0f5b04ad92922d365ce84d1e0b2c700a434c315a18a363c25b8c23959892a449  go.mod
-10caa000cba330bb9e223c3072b492b2c88152f21f49a857ce498f5306a504c9fe6eaa271e971b004fa0adf937cf5e4c584f56dce9318b2aeab36c550396fb0a  go.sum
-8fff794134b497c1d272ac69972bb468849007cb32b9255d792b74a58aea7be739d3db348da686a26fb092244c614a300dfffafb74c58a34a7c7505138158b19  apk.go
+sha512sums="adfda7bdb1ce3befcb2bcf340af60edcf7e77e67ae8d81860d773b47592e3446adf951b7df06b2ab1ef51a963ffb1067fea8796f18b9bb0a04d660028740f020  grafana-6.5.2.tar.gz
 b0a781e1b1e33741a97e231c761b1200239c6f1235ffbe82311fe883387eb23bef262ad68256ebd6cf87d74298041b53b947ea7a493cfa5aa814b2a1c5181e13  grafana.initd
 c2afa7f6baf8f468fbd781b0522cbff173bb0c3964eb08fc4a0951d034e8a1f3f9c14798e2ac487b3c20db834110883db8162039b18195e97bb9f4bc5baffc33  grafana.confd"