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

[Tristan Van Berkom <tvb src gnome org>]

commit bdae710a0656abf01dd9eaaadcfef4a310c0c9e3
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.
    
    This fixes #136.

 .gitlab-ci.yml | 14 +++++++++++++-
 .gitmodules    |  3 +++
 plugins        |  1 +
 project.conf   | 10 ++++------
 4 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c18f5725..17aba855 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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 nedded 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..32ec3d49
--- /dev/null
+++ b/plugins
@@ -0,0 +1 @@
+Subproject commit 32ec3d49432dd873fa9d531451bd7e3255170720
diff --git a/project.conf b/project.conf
index be235c90..e7a42f3f 100644
--- a/project.conf
+++ b/project.conf
@@ -295,14 +295,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