From 2bc767a4d656e11cadc29ea9b1c8c1ec752462e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin.noel@collabora.com>
Date: Thu, 4 Jan 2024 12:40:49 +0100
Subject: [PATCH] Use Git submodules

---
 .github/workflows/ci.yml      | 8 ++++++--
 .github/workflows/publish.yml | 4 +++-
 .gitmodules                   | 8 ++++++++
 Makefile                      | 3 +--
 extra-vapis                   | 1 +
 girs                          | 1 +
 6 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 extra-vapis
 create mode 160000 girs

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 563d774..6279b0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,9 @@ jobs:
         node-version: [16.x, 18.x]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
 
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v3
@@ -44,7 +46,9 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+      with:
+        submodules: true
 
     - name: Install the dependencies
       run: |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e99ce54..bb076cc 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,7 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Install the dependencies
         run: |
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..5243197
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,8 @@
+[submodule "girs"]
+	path = girs
+	url = https://github.com/nemequ/vala-girs.git
+	shallow = true
+[submodule "extra-vapis"]
+	path = extra-vapis
+	url = https://gitlab.gnome.org/GNOME/vala-extra-vapis.git
+	shallow = true
diff --git a/Makefile b/Makefile
index 31ade8b..a23a44e 100644
--- a/Makefile
+++ b/Makefile
@@ -64,8 +64,7 @@ configgen: src/configgen.vala
 
 
 update-girs:
-	[ -d girs ]        && git -C girs pull        || git clone https://github.com/nemequ/vala-girs.git girs --depth 1
-	[ -d extra-vapis ] && git -C extra-vapis pull || git clone https://gitlab.gnome.org/GNOME/vala-extra-vapis.git extra-vapis --depth 1
+	git submodule update --remote --init
 
 
 #
diff --git a/extra-vapis b/extra-vapis
new file mode 160000
index 0000000..a53319e
--- /dev/null
+++ b/extra-vapis
@@ -0,0 +1 @@
+Subproject commit a53319e7cd8564712ddd550867b1a1af9317b75b
diff --git a/girs b/girs
new file mode 160000
index 0000000..167d367
--- /dev/null
+++ b/girs
@@ -0,0 +1 @@
+Subproject commit 167d367f42d6d3e218480b87c91fc4f3dcbc4107