[gnome-build-meta/tristan/cargo-source-plugin-2: 11/12] project.conf: Changed to load plugins as submodules

[Tristan Van Berkom <tvb src gnome org>]

commit b4f95592eb365f9fa04353c8bbebf3551c406cd3
Author: Tristan Van Berkom <tristan vanberkom codethink co uk>
Date:   Mon Jul 29 19:37:48 2019 -0400

    project.conf: Changed to load plugins as submodules
    
    This commit adds bst_external as a submodule in the plugins/
    directory.
    
    This will allow us to move a bit more freely from
    freedesktop-sdk, which might not always use exactly the
    same version of the set of plugins.

 .gitlab-ci.yml | 16 ++++++++++++++--
 .gitmodules    |  3 +++
 plugins        |  1 +
 project.conf   | 10 ++++------
 4 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bfef851..8a0e3c97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ variables:
   BST_TRACK_TAGS: 'False'
   BST: "bst $BST_STRICT --config build.conf --log-file logs/build.log --colors"
   BST_SHA: '1.3.1-0-gb7a6624fbfbd82d2daa42f5a5570cbb4fbc729d2'
-  BST_EXTERNAL_SHA: '0.14.0-0-g003f1f1e7ead60627ef4242a6d785704ede44358'
+  BST_EXTERNAL_SHA: '0.17.0-0-g43a6633ea80b1992b13b8702b5d55c1805e97950'
   FLATPAK_BRANCH: master
 
   # Docker Images
@@ -25,12 +25,24 @@ stages:
 
 default:
   before_script:
+
+  # Make sure we've got our submodules
+  - git submodule update --init
+
+  # Install some dependencies for our plugins
+  - pip3 install pytoml requests
+
   # Use specific version of BuildStream
   - git clone https://gitlab.com/BuildStream/buildstream.git
   - git -C buildstream/ checkout $BST_SHA
   - pip3 install buildstream/
 
-  # install bst-external nedded for the flatpak_image plugin
+  # Install bst-external needed for the flatpak_image plugin
+  #
+  # FIXME: This is only needed by the junctioned freedesktop-sdk,
+  #        once freedesktop-sdk pulls in the plugins as submodules
+  #        too, then this installation of bst-external can go away
+  #
   - git clone https://gitlab.com/BuildStream/bst-external.git
   - git -C bst-external/ checkout $BST_EXTERNAL_SHA
   - pip3 install bst-external/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..c9f56eed
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "plugins"]
+       path = plugins
+       url = https://gitlab.com/BuildStream/bst-external.git
diff --git a/plugins b/plugins
new file mode 160000
index 00000000..43a6633e
--- /dev/null
+++ b/plugins
@@ -0,0 +1 @@
+Subproject commit 43a6633ea80b1992b13b8702b5d55c1805e97950
diff --git a/project.conf b/project.conf
index b98c5ffe..938792db 100644
--- a/project.conf
+++ b/project.conf
@@ -290,14 +290,12 @@ variables:
 
 plugins:
 - origin: local
-  path: plugins
+  path: plugins/bst_external/sources
   sources:
-    crate: 0
-- origin: pip
-  package-name: buildstream-external
+    git_tag: 1
+- origin: local
+  path: plugins/bst_external/elements
   elements:
     flatpak_image: 0
     flatpak_repo: 0
     collect_manifest: 0
-  sources:
-    git_tag: 1