From 1e4f902b28231497c6f2fe6db3f2d85352efc752 Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <i@bou.ke>
Date: Thu, 11 Apr 2024 15:31:21 +0200
Subject: [PATCH] Add gitSubmodules test to github actions

---
 .github/workflows/ci.yml       |  2 +-
 tests/nixos/git-submodules.nix | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b8eac49d..cfd1dec5d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -166,4 +166,4 @@ jobs:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
-      - run: nix build -L .#hydraJobs.tests.githubFlakes .#hydraJobs.tests.tarballFlakes
+      - run: nix build -L .#hydraJobs.tests.githubFlakes .#hydraJobs.tests.tarballFlakes .#hydraJobs.tests.gitSubmodules
diff --git a/tests/nixos/git-submodules.nix b/tests/nixos/git-submodules.nix
index 9264369ef..570b1822b 100644
--- a/tests/nixos/git-submodules.nix
+++ b/tests/nixos/git-submodules.nix
@@ -46,8 +46,24 @@
       remote.wait_for_unit("sshd")
       client.succeed(f"ssh -o StrictHostKeyChecking=no {remote.name} 'echo hello world'")
 
-      remote.succeed("git init bar && git -C bar config user.email foobar@example.com && git -C bar config user.name Foobar && echo test >> bar/content && git -C bar add content && git -C bar commit -m 'Initial commit'")
-      client.succeed(f"git init foo && git -C foo config user.email foobar@example.com && git -C foo config user.name Foobar && git -C foo submodule add root@{remote.name}:/tmp/bar sub && git -C foo add sub && git -C foo commit -m 'Add submodule'")
+      remote.succeed("""
+        git init bar
+        git -C bar config user.email foobar@example.com
+        git -C bar config user.name Foobar
+        echo test >> bar/content
+        git -C bar add content
+        git -C bar commit -m 'Initial commit'
+      """)
+
+      client.succeed(f"""
+        git init foo
+        git -C foo config user.email foobar@example.com
+        git -C foo config user.name Foobar
+        git -C foo submodule add root@{remote.name}:/tmp/bar sub
+        git -C foo add sub
+        git -C foo commit -m 'Add submodule'
+      """)
+
       client.succeed("nix --flake-registry \"\" flake prefetch 'git+file:///tmp/foo?submodules=1&ref=master'")
     '';
   };