summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schubert <contact@benschubert.me>2020-07-09 11:46:16 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2020-07-14 14:27:07 +0000
commitcd7e2d6debdbe53b2f398274d30710e58b1e7761 (patch)
tree63c9a89f51d1f44a2ab273ff72a2a2c7d8ae4e58
parentc25c819df8aa858cca72a9348bc81e7140e219f7 (diff)
downloadbuildstream-bschubert/update-plugins.tar.gz
Update bst-plugins-experimental to 1.93.4bschubert/update-plugins
This removes the 'ostree' extra and some build dependencies
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--tox.ini6
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5f2245c9..7592372c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -331,7 +331,7 @@ docs:
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION}
variables:
FD_SDK_REF: valentindavid/bst2
- BST_EXT_REF: 1.93.3
+ BST_EXT_REF: 1.93.4
before_script:
- |
mkdir -p "${HOME}/.config"
@@ -339,7 +339,7 @@ docs:
scheduler:
fetchers: 2
EOF
- - dnf install -y ostree python3-gobject-base
+ - dnf install -y ostree
# Install pinned BuildStream dependencies, BuildStream from the local repository
# and bst-plugins-expeirmental from its repository
- |
diff --git a/tox.ini b/tox.ini
index f7146294c..e2b84aa3c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ isolated_build = true
# Configuration variables to share across environments
[config]
-BST_PLUGINS_EXPERIMENTAL_VERSION = 1.93.2
+BST_PLUGINS_EXPERIMENTAL_VERSION = 1.93.4
#
# Defaults for all environments
@@ -40,7 +40,7 @@ deps =
py{36,37,38}: {toxinidir}/tests/plugins/sample-plugins
# Install external plugins for plugin tests
- py{36,37,38}-plugins: git+https://gitlab.com/buildstream/bst-plugins-experimental.git@{env:BST_PLUGINS_EXPERIMENTAL_VERSION:{[config]BST_PLUGINS_EXPERIMENTAL_VERSION}}#egg=bst_plugins_experimental[ostree,deb]
+ py{36,37,38}-plugins: git+https://gitlab.com/buildstream/bst-plugins-experimental.git@{env:BST_PLUGINS_EXPERIMENTAL_VERSION:{[config]BST_PLUGINS_EXPERIMENTAL_VERSION}}#egg=bst_plugins_experimental[deb]
# Only require coverage and pytest-cov when using it
!nocover: -rrequirements/cov-requirements.txt
@@ -173,7 +173,7 @@ deps =
sphinx_rtd_theme >= 0.4.2
pytest
-rrequirements/requirements.txt
- git+https://gitlab.com/buildstream/bst-plugins-experimental.git@{env:BST_PLUGINS_EXPERIMENTAL_VERSION:{[config]BST_PLUGINS_EXPERIMENTAL_VERSION}}#egg=bst_plugins_experimental[ostree]
+ git+https://gitlab.com/buildstream/bst-plugins-experimental.git@{env:BST_PLUGINS_EXPERIMENTAL_VERSION:{[config]BST_PLUGINS_EXPERIMENTAL_VERSION}}
passenv =
BST_FORCE_SESSION_REBUILD
BST_SOURCE_CACHE