summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hsuan Yen2018-09-23 12:47:36 +0800
committerChih-Hsuan Yen2018-09-23 12:47:36 +0800
commit2b1b94fc5c254bee72d4eed65b322d61a9beac16 (patch)
treeb94e740938f63968a53821f84bdf2cfeef832433
parentdce4d4b5d8eb1e817e2e317e2a6c3b554547b83b (diff)
downloadaur-2b1b94fc5c254bee72d4eed65b322d61a9beac16.tar.gz
re-enable moto-related tests
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD19
2 files changed, 18 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 977935238afd..3a6c6dd72241 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = buildbot-git
pkgdesc = The Continuous Integration Framework
- pkgver = 1.3.0.r53.g36d2e3332
- pkgrel = 1
+ pkgver = 1.4.0.r99.gc8595820f
+ pkgrel = 2
url = https://buildbot.net
arch = any
license = GPL2
@@ -17,6 +17,7 @@ pkgbase = buildbot-git
checkdepends = python-txrequests
checkdepends = python-setuptools_trial
checkdepends = python-pyjade
+ checkdepends = python-yaml
checkdepends = python-buildbot-pkg-git
checkdepends = buildbot-worker-git
checkdepends = openssh
@@ -30,6 +31,8 @@ pkgbase = buildbot-git
depends = python-txaio
depends = python-autobahn
depends = python-pyjwt
+ provides = buildbot=1.4.0.r99.gc8595820f
+ conflicts = buildbot
source = git+https://github.com/buildbot/buildbot.git
source = skip-linux-distro-test.patch
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8a94346605ba..6bb23a3f9730 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,11 @@
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
+_pkgname=buildbot
pkgname=buildbot-git
pkgdesc="The Continuous Integration Framework"
-pkgver=1.3.0.r53.g36d2e3332
-pkgrel=1
+pkgver=1.4.0.r99.gc8595820f
+pkgrel=2
arch=('any')
url="https://buildbot.net"
license=("GPL2")
@@ -18,9 +19,11 @@ makedepends=('git')
checkdepends=('python-treq' 'python-boto3' 'python-mock' 'python-moto'
'python-lz4' 'python-isort' 'python-pylint' 'python-pyenchant'
'flake8' 'python-txrequests' 'python-setuptools_trial'
- 'python-pyjade'
+ 'python-pyjade' 'python-yaml'
'python-buildbot-pkg-git' 'buildbot-worker-git'
'openssh')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
source=(git+https://github.com/buildbot/buildbot.git
skip-linux-distro-test.patch)
sha256sums=('SKIP'
@@ -29,8 +32,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//'
)
}
@@ -42,6 +44,11 @@ prepare() {
patch -Np1 -i ../skip-linux-distro-test.patch
}
+build() {
+ cd buildbot/master
+ python setup.py build
+}
+
check() {
cd buildbot/master
TZ=UTC python setup.py test --rterrors
@@ -49,5 +56,5 @@ check() {
package() {
cd buildbot/master
- python setup.py install --root="$pkgdir" --optimize=1
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
}