[arch-commits] Commit in prometheus/trunk (PKGBUILD)

[Jelle van der Waa]

    Date: Monday, September 20, 2021 @ 07:37:13
  Author: jelle
Revision: 424396

Update and make data dir not world readable

Call the assets dependency targets manually as `make assets` fails due to some
obscure reason.

Fixes: FS#70145

Modified:
  prometheus/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-20 07:18:15 UTC (rev 424395)
+++ PKGBUILD	2021-09-20 07:37:13 UTC (rev 424396)
@@ -1,7 +1,7 @@
 # Maintainer: Johannes Löthberg <johannes at kyriasis.com>
 
 pkgname=prometheus
-pkgver=2.29.2
+pkgver=2.30.0
 pkgrel=1
 
 pkgdesc='An open-source systems monitoring and alerting toolkit'
@@ -10,7 +10,7 @@
 license=('Apache')
 
 depends=('glibc')
-makedepends=('go' 'git' 'bzr' 'yarn')
+makedepends=('go' 'git' 'npm' 'nodejs')
 
 backup=('etc/prometheus/prometheus.yml' 'etc/conf.d/prometheus')
 
@@ -19,7 +19,7 @@
         prometheus.sysusers
         prometheus.conf)
 
-sha256sums=('8ac87a7d0982750618cb416d07c85aeb17df200e73da28d5e98d4b89476c26b9'
+sha256sums=('900dc07f54c1251f22d18c2a5751bb1b0192b3d9960406a2c7ea3098a688d53c'
             'f358986865bd3d06dc47a265aeb3b5ef64aa644e831f07731c2fc7af64d9e98f'
             '2747fabb4e56b808361eb7dd7acf9729ab8973d1ebe2f857dd56f6c71f71e45f'
             '6d32deb125381cbebac11b6953a7d9a65eb7e50f209dc1e22c63facf678a3070')
@@ -34,7 +34,18 @@
     -X github.com/prometheus/common/version.BuildUser=someone at builder \
     -X github.com/prometheus/common/version.BuildDate=$(date -u '+%Y%m%d-%H:%M:%S' --date=@${SOURCE_DATE_EPOCH})"
 
-  make assets
+  # The makefile seems to not be able to execute npm properly, so run the make assets target manually
+  cd web/ui/module/codemirror-promql
+  npm install
+  npm run build
+
+  cd $srcdir/prometheus-$pkgver/web/ui
+  GOOS= GOARCH= go generate -x -v
+
+  cd $srcdir/prometheus-$pkgver
+  # Build the react app, normally a part of the assets target
+  make web/ui/static/react
+
   go build \
     -trimpath \
     -buildmode=pie \
@@ -66,7 +77,7 @@
 
   install -Dm755 -t "$pkgdir"/usr/bin prometheus promtool
   install -Dm640 -g210 -t "$pkgdir"/etc/prometheus documentation/examples/prometheus.yml
-  install -dm755 -o210 -g210 "$pkgdir"/var/lib/prometheus
+  install -dm750 -o210 -g210 "$pkgdir"/var/lib/prometheus
 
   # Web
   install -dm755 "$pkgdir"/usr/share/prometheus/web/ui