hashworks pushed to branch main at Arch Linux / Packaging / Packages / consul
Commits:
77819832 by Justin Kromlinger at 2024-02-14T19:52:51+01:00
upgpkg: 1.17.3-1: Re-build consul UI to fix UI version number
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = consul
pkgdesc = A tool for service discovery, monitoring and configuration.
- pkgver = 1.17.2
+ pkgver = 1.17.3
pkgrel = 1
url = https://www.consul.io
install = consul.install
@@ -10,9 +10,14 @@ pkgbase = consul
makedepends = go
makedepends = gox
makedepends = go-tools
+ makedepends = procps-ng
+ makedepends = zip
+ makedepends = yarn
+ makedepends = nodejs-lts-hydrogen
+ makedepends = npm
depends = glibc
backup = etc/default/consul
- source =
git+https://github.com/hashicorp/consul#commit=7736539db5305d267b2fd4faa6e86590ca20e556
+ source =
git+https://github.com/hashicorp/consul#commit=009041f807ba1d6263052fda7406bc0d9e3125af
source = consul.service
source = consul.default
source = consul.sysusers
=====================================
PKGBUILD
=====================================
@@ -3,8 +3,8 @@
# Maintainer: Justin Kromlinger <hashwo...@archlinux.org>
pkgname=consul
-_commit=7736539db5305d267b2fd4faa6e86590ca20e556
-pkgver=1.17.2
+_commit=009041f807ba1d6263052fda7406bc0d9e3125af
+pkgver=1.17.3
pkgrel=1
pkgdesc="A tool for service discovery, monitoring and configuration."
arch=('x86_64')
@@ -12,7 +12,7 @@ url="https://www.consul.io";
license=('BUSL-1.1')
depends=('glibc')
makedepends=('git' 'go' 'gox' 'go-tools')
-#makedepends+=('procps-ng' 'zip' 'yarn' 'nodejs-lts-fermium' 'npm') #
makedepds for the UI
+makedepends+=('procps-ng' 'zip' 'yarn' 'nodejs-lts-hydrogen' 'npm') #
makedepends for the UI
source=("git+https://github.com/hashicorp/consul#commit=${_commit}";
'consul.service'
'consul.default'
@@ -52,13 +52,14 @@ prepare() {
}
build() {
+ #
https://github.com/hashicorp/consul/blob/v1.17.2/.github/workflows/build.yml#L126
+ cd "${srcdir}/${pkgname}/ui/packages/consul-ui"
+ make build
+ rm -Rf "${srcdir}/${pkgname}/agent/uiserver/dist"
+ mv dist "${srcdir}/${pkgname}/agent/uiserver/"
+
cd "${srcdir}/${pkgname}"
go build -o build './...'
-
- # resulting UI build can be found in the dist/ subdirectory
- # TODO: decide if we want the UI and then figure out where to put it in the
pkgdir
- #cd ui/packages/consul-ui
- #make build
}
check() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/consul/-/commit/77819832a850932fcd6a160f284b4a75a867952c
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/consul/-/commit/77819832a850932fcd6a160f284b4a75a867952c
You're receiving this email because of your account on gitlab.archlinux.org.
