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

[Jelle van der Waa]

    Date: Monday, April 25, 2022 @ 11:10:38
  Author: jelle
Revision: 443943

upgpkg: prometheus 2.35.0-1

Modified:
  prometheus/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-25 09:52:57 UTC (rev 443942)
+++ PKGBUILD	2022-04-25 11:10:38 UTC (rev 443943)
@@ -1,7 +1,7 @@
 # Maintainer: Johannes Löthberg <johannes at kyriasis.com>
 
 pkgname=prometheus
-pkgver=2.34.0
+pkgver=2.35.0
 pkgrel=1
 
 pkgdesc='An open-source systems monitoring and alerting toolkit'
@@ -10,7 +10,7 @@
 license=('Apache')
 
 depends=('glibc')
-makedepends=('go' 'git' 'npm' 'nodejs' 'yamllint')
+makedepends=('go' 'git' 'npm' 'nodejs' 'yamllint' 'typescript' 'yarn')
 
 options=(!lto)
 backup=('etc/prometheus/prometheus.yml' 'etc/conf.d/prometheus')
@@ -20,7 +20,7 @@
         prometheus.sysusers
         prometheus.conf)
 
-sha256sums=('76bb5afff1a9be179b99afe624fae73d5c23a27976f2bcb2dc663d1942e87e22'
+sha256sums=('5264a7b59f5b9e28d3c47bf694a1062e6d3745c3797d28585c2b44eb9d72da1f'
             'f358986865bd3d06dc47a265aeb3b5ef64aa644e831f07731c2fc7af64d9e98f'
             '2747fabb4e56b808361eb7dd7acf9729ab8973d1ebe2f857dd56f6c71f71e45f'
             '6d32deb125381cbebac11b6953a7d9a65eb7e50f209dc1e22c63facf678a3070')
@@ -35,19 +35,13 @@
     -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})"
 
-  # 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
-  make ui-install
-  make ui-build
+  # Build the react app
+  make ui-install # run install first as otherwise the makefile has a race condition......
+  make assets
 
   go build \
     -trimpath \