This is an automated email from the ASF dual-hosted git repository. tvb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/buildstream-plugins.git
commit 921d1a1f74ed4061bba06fefff6d2b48a929e54f Author: Tristan van Berkom <[email protected]> AuthorDate: Tue Apr 5 18:01:06 2022 +0900 tests/elements/{cmake,meson}: Use zip source from bst-plugins-experimental We need the zip source in order to download and use ninja, but the zip source is removed from buildstream and buildstream-plugins - use it from the latest release of bst-plugins-experimental. Also update tox.ini to use the latest version of buildstream --- tests/elements/cmake/elements/bst-plugins-experimental-junction.bst | 5 +++++ tests/elements/cmake/project.conf | 5 +++++ tests/elements/meson/elements/bst-plugins-experimental-junction.bst | 5 +++++ tests/elements/meson/project.conf | 5 +++++ tox.ini | 2 +- 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tests/elements/cmake/elements/bst-plugins-experimental-junction.bst b/tests/elements/cmake/elements/bst-plugins-experimental-junction.bst new file mode 100644 index 0000000..769de4b --- /dev/null +++ b/tests/elements/cmake/elements/bst-plugins-experimental-junction.bst @@ -0,0 +1,5 @@ +kind: junction +sources: +- kind: tar + url: pypi:0c/dd/c2afff7697104f37fd67d98931c402153409bdd2b35442e088460c452f9d/bst-plugins-experimental-1.93.7.tar.gz + ref: 0646cf740cdc049c6343059816d36d2181d31aa0d1632107159c737a4332c83c diff --git a/tests/elements/cmake/project.conf b/tests/elements/cmake/project.conf index bdcf99b..bd8d972 100644 --- a/tests/elements/cmake/project.conf +++ b/tests/elements/cmake/project.conf @@ -9,7 +9,12 @@ plugins: package-name: buildstream-plugins elements: - cmake +- origin: junction + junction: bst-plugins-experimental-junction.bst + sources: + - zip aliases: alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ + pypi: https://files.pythonhosted.org/packages/ project_dir: file://{project_dir} diff --git a/tests/elements/meson/elements/bst-plugins-experimental-junction.bst b/tests/elements/meson/elements/bst-plugins-experimental-junction.bst new file mode 100644 index 0000000..769de4b --- /dev/null +++ b/tests/elements/meson/elements/bst-plugins-experimental-junction.bst @@ -0,0 +1,5 @@ +kind: junction +sources: +- kind: tar + url: pypi:0c/dd/c2afff7697104f37fd67d98931c402153409bdd2b35442e088460c452f9d/bst-plugins-experimental-1.93.7.tar.gz + ref: 0646cf740cdc049c6343059816d36d2181d31aa0d1632107159c737a4332c83c diff --git a/tests/elements/meson/project.conf b/tests/elements/meson/project.conf index 52ffbf0..9ca5151 100644 --- a/tests/elements/meson/project.conf +++ b/tests/elements/meson/project.conf @@ -10,7 +10,12 @@ plugins: elements: - meson - setuptools +- origin: junction + junction: bst-plugins-experimental-junction.bst + sources: + - zip aliases: alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ + pypi: https://files.pythonhosted.org/packages/ project_dir: file://{project_dir} diff --git a/tox.ini b/tox.ini index 4a3f1ff..8b1cf96 100644 --- a/tox.ini +++ b/tox.ini @@ -43,7 +43,7 @@ setenv = py{37,38,39,310}: XDG_CACHE_HOME = {envtmpdir}/cache py{37,38,39,310}: XDG_CONFIG_HOME = {envtmpdir}/config py{37,38,39,310}: XDG_DATA_HOME = {envtmpdir}/share - !master: BST_VERSION = 10be3784afa924d5af63958fea9354d0323eadad + !master: BST_VERSION = 1a3c707a6c46573ab159de64ac9cd92e7f6027e6 master: BST_VERSION = master whitelist_externals =
