From f3b926adca89a7d15a65b6fc44e792a9f26025e7 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sun, 21 May 2023 22:58:27 +0200
Subject: [PATCH] remove lxc-helpers as a submodule

---
 .forgejo/workflows/forgejo-sh.yml  | 2 --
 .forgejo/workflows/integration.yml | 2 --
 .gitmodules                        | 3 ---
 forgejo-dependencies.sh            | 2 +-
 forgejo-test-helper.sh             | 4 ++--
 lxc-helpers                        | 1 -
 6 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 160000 lxc-helpers

diff --git a/.forgejo/workflows/forgejo-sh.yml b/.forgejo/workflows/forgejo-sh.yml
index b18b4b4..7fecb0d 100644
--- a/.forgejo/workflows/forgejo-sh.yml
+++ b/.forgejo/workflows/forgejo-sh.yml
@@ -11,8 +11,6 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: 'true'
       - run: |
           set -x
           ./forgejo-dependencies.sh install_docker
diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml
index c751d55..fc0e253 100644
--- a/.forgejo/workflows/integration.yml
+++ b/.forgejo/workflows/integration.yml
@@ -4,8 +4,6 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: 'true'
       - run: |
           set -x
           LXC_IP_PREFIX=10.0.9 ./forgejo-dependencies.sh
diff --git a/.gitmodules b/.gitmodules
index 2a45ddd..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "lxc-helpers"]
-	path = lxc-helpers
-	url = https://code.forgejo.org/forgejo/lxc-helpers
diff --git a/forgejo-dependencies.sh b/forgejo-dependencies.sh
index 670bbcf..63b87f4 100755
--- a/forgejo-dependencies.sh
+++ b/forgejo-dependencies.sh
@@ -3,7 +3,7 @@
 
 set -x
 
-source $(dirname $0)/lxc-helpers/lxc-helpers-lib.sh
+source $(dirname $0)/lxc-helpers-lib.sh
 
 : ${LXC_IP_PREFIX:=10.0.8}
 
diff --git a/forgejo-test-helper.sh b/forgejo-test-helper.sh
index cc6eddb..4118277 100755
--- a/forgejo-test-helper.sh
+++ b/forgejo-test-helper.sh
@@ -138,10 +138,10 @@ function push_self_action() {
     local tag="$4"
 
     local dir="$DIR/self"
-    git clone --recurse-submodules . $dir
+    git clone . $dir
     (
 	cd $dir
-	rm -fr .forgejo .git lxc-helpers/.git
+	rm -fr .forgejo .git
 	git init
 	git checkout -b main
 	git remote add origin "$url/$owner/$self_action"
diff --git a/lxc-helpers b/lxc-helpers
deleted file mode 160000
index b076638..0000000
--- a/lxc-helpers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0766388a2624bc56258053576c7c09dba2e7cf5