Date: Thursday, April 20, 2023 @ 12:54:40 Author: yan12125 Revision: 1447773
upgpkg: buildbot 3.8.0-1; add experimental react-based plugins, remove merged patches, add implicit dependencies detected by namcap Modified: buildbot/trunk/PKGBUILD Deleted: buildbot/trunk/05f8bfb2af5f77de2c512254d306bff983fec242.patch ------------------------------------------------+ 05f8bfb2af5f77de2c512254d306bff983fec242.patch | 24 ------ PKGBUILD | 85 ++++++++++++++--------- 2 files changed, 55 insertions(+), 54 deletions(-) Deleted: 05f8bfb2af5f77de2c512254d306bff983fec242.patch =================================================================== --- 05f8bfb2af5f77de2c512254d306bff983fec242.patch 2023-04-20 12:16:48 UTC (rev 1447772) +++ 05f8bfb2af5f77de2c512254d306bff983fec242.patch 2023-04-20 12:54:40 UTC (rev 1447773) @@ -1,24 +0,0 @@ -From 05f8bfb2af5f77de2c512254d306bff983fec242 Mon Sep 17 00:00:00 2001 -From: Povilas Kanapickas <[email protected]> -Date: Wed, 7 Dec 2022 22:13:22 +0200 -Subject: [PATCH] www/react: Fix websocket connections on https - ---- - www/react-base/src/data/WebSocketClient.ts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/www/react-base/src/data/WebSocketClient.ts b/www/react-base/src/data/WebSocketClient.ts -index 1388d5ab3b5..2c94e32db6a 100644 ---- a/www/react-base/src/data/WebSocketClient.ts -+++ b/www/react-base/src/data/WebSocketClient.ts -@@ -147,8 +147,8 @@ export class WebSocketClient { - - export function getWebSocketUrl(location: Location) { - const hostname = location.hostname; -- const protocol = location.protocol === 'https' ? 'wss' : 'ws'; -- const defaultport = location.protocol === 'https' ? '443' : '80'; -+ const protocol = location.protocol === 'https:' ? 'wss' : 'ws'; -+ const defaultport = location.protocol === 'https:' ? '443' : '80'; - const path = location.pathname; - const port = location.port === defaultport ? '' : `:${location.port}`; - return `${protocol}://${hostname}${port}${path}ws`; Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-04-20 12:16:48 UTC (rev 1447772) +++ PKGBUILD 2023-04-20 12:54:40 UTC (rev 1447773) @@ -8,11 +8,12 @@ python-buildbot-www python-buildbot-www-react python-buildbot-waterfall-view python-buildbot-console-view python-buildbot-grid-view - python-buildbot-wsgi-dashboards python-buildbot-badges) + python-buildbot-wsgi-dashboards python-buildbot-badges + python-buildbot-react-console-view python-buildbot-react-grid-view) # https://github.com/buildbot/buildbot/releases -pkgver=3.7.0 +pkgver=3.8.0 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f -pkgrel=2 +pkgrel=1 arch=(any) url='https://buildbot.net' license=(GPL2) @@ -31,20 +32,20 @@ git yarn) source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.asc} "git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit"; - "buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch"; - "05f8bfb2af5f77de2c512254d306bff983fec242.patch" - "buildbot-py311.patch::https://github.com/buildbot/buildbot/pull/6813.patch";) -sha256sums=('8d8b519dd60374bc327f2f829cdffdaaca415d65c7a89abd9a89435e7b7f81b9' + "buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch";) +sha256sums=('48a35cc3f47552a94c6eb7543c3b25fe7ef2da052028057754402652c060a92c' 'SKIP' 'SKIP' - '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9' - '23255ee665043109d3b267d1846e2ae73ff54bf2e7155e99996280a9e918ce69' - '8665c30408aac249271dc57e65a38e8441e2e75061523b381ea9233a1d2fd200') + '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9') validpgpkeys=( '390EB159056ED56F66AB1092AECD456B4D2531FC' # Pierre Tardy <[email protected]> (@tardyp on GitHub) 'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Povilas Kanapickas <[email protected]> (@p12tic on GitHub) ) +_buildbot_www_modules_with_tests=(base waterfall_view console_view grid_view wsgi_dashboards) +_buildbot_www_react_modules_with_tests=(react-base react-console_view react-grid_view) +_buildbot_www_modules=(${_buildbot_www_modules_with_tests[@]} ${_buildbot_www_react_modules_with_tests[@]} badges) + prepare() { cd buildbot-$pkgver @@ -67,14 +68,6 @@ # in upstream CI and introduces extra deprecation warnings sed -r -i "s#warnings\\.filterwarnings\\('error'\\)##" master/buildbot/test/__init__.py - # www/react: Fix websocket connections on https - # Part of https://github.com/buildbot/buildbot/pull/6753 (merged to git master) - patch -Np1 -i ../05f8bfb2af5f77de2c512254d306bff983fec242.patch - - # Fixes for Python 3.11 - # https://github.com/buildbot/buildbot/pull/6813 (merged to git master) - patch -Np1 -i ../buildbot-py311.patch - cd "$srcdir"/buildbot-contrib patch -Np1 -i ../buildbot-contrib-systemd-common.patch } @@ -100,7 +93,7 @@ make PIP=/usr/bin/true frontend_deps export PYTHONPATH="$srcdir"/buildbot-$pkgver/pkg - for module in base react-base waterfall_view console_view grid_view wsgi_dashboards badges + for module in ${_buildbot_www_modules[@]} do cd "$srcdir"/buildbot-$pkgver/www/$module python setup.py build @@ -135,17 +128,25 @@ cd "$srcdir"/buildbot-$pkgver/worker PYTHONPATH=. trial buildbot_worker - for module in base waterfall_view console_view grid_view wsgi_dashboards + export CHROME_BIN=/usr/bin/chromium + + for module in ${_buildbot_www_modules_with_tests[@]} do cd "$srcdir"/buildbot-$pkgver/www/$module - CHROME_BIN=/usr/bin/chromium yarn run test --browsers BBChromeHeadless + yarn run test --browsers BBChromeHeadless done + + for module in ${_buildbot_www_react_modules_with_tests[@]} + do + cd "$srcdir"/buildbot-$pkgver/www/$module + yarn run test + done } package_buildbot() { pkgdesc='The Continuous Integration Framework' # include setuptools as plugins are enumerated via pkg_resources - depends=(buildbot-common python-twisted python-jinja python-msgpack python-zope-interface python-sqlalchemy + depends=(buildbot-common python python-twisted python-jinja python-msgpack python-zope-interface python-sqlalchemy python-alembic python-dateutil python-txaio python-autobahn python-pyjwt python-yaml python-setuptools) optdepends=( @@ -167,8 +168,10 @@ 'buildbot-worker: for local worker' 'libvirt-python: for libvirt worker' 'python-boto3: for AWS EC2 latent worker' + 'python-botocore: for AWS EC2 latent worker' 'python-docker: for Docker latent worker' 'python-novaclient: for OpenStack latent worker' + 'python-keystoneauth1: for OpenStack latent worker' # www 'python-graphql-core: GraphQL API for buildbot' 'python-ldap3: to authenticate users via LDAP' @@ -187,7 +190,10 @@ package_buildbot-worker() { pkgdesc='Buildbot worker daemon' - depends=(buildbot-common python-twisted python-future python-autobahn python-msgpack) + depends=(buildbot-common python python-twisted python-future python-autobahn python-msgpack python-zope-interface) + optdepends=( + 'buildbot: for local worker' + ) cd buildbot-$pkgver/worker python setup.py install --root="$pkgdir" --optimize=1 --skip-build @@ -230,8 +236,10 @@ package_python-buildbot-www-react() { pkgdesc='React-based Buildbot UI (experimental)' depends=(python buildbot) - # buildbot-www-react does not support plugins yet - optdepends=() + optdepends=( + 'python-buildbot-react-console-view' + 'python-buildbot-react-grid-view' + ) cd buildbot-$pkgver/www/react-base python setup.py install --root="$pkgdir" --optimize=1 --skip-build @@ -239,7 +247,7 @@ package_python-buildbot-waterfall-view() { pkgdesc='Buildbot Waterfall View plugin' - depends=(python-buildbot-www) + depends=(buildbot python-buildbot-www) cd buildbot-$pkgver/www/waterfall_view python setup.py install --root="$pkgdir" --optimize=1 --skip-build @@ -247,7 +255,7 @@ package_python-buildbot-console-view() { pkgdesc='Buildbot Console View plugin' - depends=(python-buildbot-www) + depends=(buildbot python-buildbot-www) cd buildbot-$pkgver/www/console_view python setup.py install --root="$pkgdir" --optimize=1 --skip-build @@ -255,7 +263,7 @@ package_python-buildbot-grid-view() { pkgdesc='Buildbot Grid View plugin' - depends=(python-buildbot-www) + depends=(buildbot python-buildbot-www) cd buildbot-$pkgver/www/grid_view python setup.py install --root="$pkgdir" --optimize=1 --skip-build @@ -263,7 +271,7 @@ package_python-buildbot-wsgi-dashboards() { pkgdesc='Buildbot plugin to integrate flask or bottle dashboards to buildbot UI' - depends=(python-buildbot-www) + depends=(buildbot python-buildbot-www python-twisted) cd buildbot-$pkgver/www/wsgi_dashboards python setup.py install --root="$pkgdir" --optimize=1 --skip-build @@ -271,7 +279,7 @@ package_python-buildbot-badges() { pkgdesc='Buildbot badges' - depends=(python-buildbot-www python-klein python-cairosvg python-cairocffi python-jinja) + depends=(python buildbot python-buildbot-www python-klein python-cairosvg python-cairocffi python-jinja python-twisted) # https://github.com/buildbot/buildbot/blob/v1.6.0/www/badges/buildbot_badges/__init__.py#L40 optdepends=( 'ttf-dejavu: the default font for rendering badges as PNGs' @@ -280,3 +288,20 @@ cd buildbot-$pkgver/www/badges python setup.py install --root="$pkgdir" --optimize=1 --skip-build } + +package_python-buildbot-react-console-view() { +pkgdesc='Buildbot Console View plugin (React)' + depends=(buildbot python-buildbot-www-react) + + cd buildbot-$pkgver/www/react-console_view + python setup.py install --root="$pkgdir" --optimize=1 --skip-build +} + +package_python-buildbot-react-grid-view() { + pkgdesc='Buildbot Grid View plugin (React)' + depends=(buildbot python-buildbot-www-react) + + cd buildbot-$pkgver/www/react-grid_view + python setup.py install --root="$pkgdir" --optimize=1 --skip-build +} +
