summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO23
-rw-r--r--PKGBUILD66
2 files changed, 67 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3479b526c67..58df43fb30b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = buildbot-www-git
- pkgver = 1.3.0.r2.g95fc42ba3
- pkgrel = 1
+ pkgver = 1.3.0.r168.g4680f8e25
+ pkgrel = 2
url = https://buildbot.net
arch = any
license = GPL2
@@ -8,9 +8,6 @@ pkgbase = buildbot-www-git
makedepends = buildbot-git
makedepends = python-buildbot-pkg-git
makedepends = python-mock
- makedepends = npm
- makedepends = yarn
- makedepends = python2
source = git+https://github.com/buildbot/buildbot.git
source = cairosvg2.patch
sha256sums = SKIP
@@ -19,22 +16,36 @@ pkgbase = buildbot-www-git
pkgname = python-buildbot-www-git
pkgdesc = Buildbot UI
depends = buildbot-git
+ optdepends = python-buildbot-waterfall-view
+ optdepends = python-buildbot-console-view
+ optdepends = python-buildbot-grid-view
+ optdepends = python-buildbot-badges
+ provides = python-buildbot-www=1.3.0.r168.g4680f8e25
+ conflicts = python-buildbot-www
pkgname = python-buildbot-waterfall-view-git
pkgdesc = Buildbot Waterfall View plugin
depends = buildbot-git
+ provides = python-buildbot-waterfall-view=1.3.0.r168.g4680f8e25
+ conflicts = python-buildbot-waterfall-view
pkgname = python-buildbot-console-view-git
pkgdesc = Buildbot Console View plugin
depends = buildbot-git
+ provides = python-buildbot-console-view=1.3.0.r168.g4680f8e25
+ conflicts = python-buildbot-console-view
pkgname = python-buildbot-grid-view-git
pkgdesc = Buildbot Grid View plugin
depends = buildbot-git
+ provides = python-buildbot-grid-view=1.3.0.r168.g4680f8e25
+ conflicts = python-buildbot-grid-view
pkgname = python-buildbot-wsgi-dashboards-git
pkgdesc = Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
depends = buildbot-git
+ provides = python-buildbot-wsgi-dashboards=1.3.0.r168.g4680f8e25
+ conflicts = python-buildbot-wsgi-dashboards
pkgname = python-buildbot-badges-git
pkgdesc = Buildbot badges
@@ -43,4 +54,6 @@ pkgname = python-buildbot-badges-git
depends = python-cairosvg
depends = python-cairocffi
depends = python-jinja
+ provides = python-buildbot-badges=1.3.0.r168.g4680f8e25
+ conflicts = python-buildbot-badges
diff --git a/PKGBUILD b/PKGBUILD
index b6d03752ef0..31c943ca6d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,12 +9,12 @@ pkgname=('python-buildbot-www-git' 'python-buildbot-waterfall-view-git'
'python-buildbot-console-view-git' 'python-buildbot-grid-view-git'
'python-buildbot-wsgi-dashboards-git' 'python-buildbot-badges-git'
)
-pkgver=1.3.0.r2.g95fc42ba3
-pkgrel=1
+pkgver=1.3.0.r168.g4680f8e25
+pkgrel=2
arch=('any')
url="https://buildbot.net"
license=("GPL2")
-makedepends=('git' 'buildbot-git' 'python-buildbot-pkg-git' 'python-mock' 'npm' 'yarn' 'python2')
+makedepends=('git' 'buildbot-git' 'python-buildbot-pkg-git' 'python-mock')
source=(git+https://github.com/buildbot/buildbot.git
cairosvg2.patch)
sha256sums=('SKIP'
@@ -23,8 +23,7 @@ sha256sums=('SKIP'
pkgver() {
cd buildbot
( set -o pipefail
- git describe --long --tag 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//' ||
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ git describe --long --tag 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
)
}
@@ -32,52 +31,85 @@ prepare() {
cd buildbot
patch -Np1 -i ../cairosvg2.patch
+
+ # registry.yarnpkg.com is going to be deprecated, and sometimes this domain
+ # name fails to resolve
+ # https://github.com/yarnpkg/yarn/issues/5891
+ sed -i 's#registry.yarnpkg.com#registry.npmjs.org#' www/*/yarn.lock
+}
+
+build() {
+ for module in base waterfall_view console_view grid_view wsgi_dashboards badges
+ do
+ cd "$srcdir/buildbot/www/$module"
+ python setup.py build
+ done
}
package_python-buildbot-www-git() {
- depends=('buildbot-git')
pkgdesc="Buildbot UI"
+ depends=('buildbot-git')
+ provides=("python-buildbot-www=$pkgver")
+ conflicts=('python-buildbot-www')
+ optdepends=(
+ 'python-buildbot-waterfall-view'
+ 'python-buildbot-console-view'
+ 'python-buildbot-grid-view'
+ 'python-buildbot-badges'
+ )
cd buildbot/www/base
- python setup.py install --root="$pkgdir" --optimize=1
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
}
package_python-buildbot-waterfall-view-git() {
- depends=('buildbot-git')
pkgdesc="Buildbot Waterfall View plugin"
+ depends=('buildbot-git')
+ provides=("python-buildbot-waterfall-view=$pkgver")
+ conflicts=('python-buildbot-waterfall-view')
cd buildbot/www/waterfall_view
- python setup.py install --root="$pkgdir" --optimize=1
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
}
package_python-buildbot-console-view-git() {
- depends=('buildbot-git')
pkgdesc="Buildbot Console View plugin"
+ depends=('buildbot-git')
+ provides=("python-buildbot-console-view=$pkgver")
+ conflicts=('python-buildbot-console-view')
cd buildbot/www/console_view
- python setup.py install --root="$pkgdir" --optimize=1
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
}
package_python-buildbot-grid-view-git() {
- depends=('buildbot-git')
pkgdesc="Buildbot Grid View plugin"
+ depends=('buildbot-git')
+ provides=("python-buildbot-grid-view=$pkgver")
+ conflicts=('python-buildbot-grid-view')
cd buildbot/www/grid_view
- python setup.py install --root="$pkgdir" --optimize=1
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
}
package_python-buildbot-wsgi-dashboards-git() {
- depends=('buildbot-git')
pkgdesc="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+ depends=('buildbot-git')
+ provides=("python-buildbot-wsgi-dashboards=$pkgver")
+ conflicts=('python-buildbot-wsgi-dashboards')
cd buildbot/www/wsgi_dashboards
- python setup.py install --root="$pkgdir" --optimize=1
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
}
package_python-buildbot-badges-git() {
- depends=('buildbot-git' 'python-klein' 'python-cairosvg' 'python-cairocffi' 'python-jinja')
pkgdesc="Buildbot badges"
+ depends=('buildbot-git' 'python-klein' 'python-cairosvg' 'python-cairocffi' 'python-jinja')
+ provides=("python-buildbot-badges=$pkgver")
+ conflicts=('python-buildbot-badges')
cd buildbot/www/badges
- python setup.py install --root="$pkgdir" --optimize=1
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
}
+
+# vim: set et ts=2 sw=2: