remove lxc-helpers as a submodule

This commit is contained in:
Earl Warren 2023-05-21 22:58:27 +02:00
parent 6a5ec6ba37
commit f3b926adca
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
6 changed files with 3 additions and 11 deletions

View file

@ -11,8 +11,6 @@ jobs:
runs-on: self-hosted runs-on: self-hosted
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with:
submodules: 'true'
- run: | - run: |
set -x set -x
./forgejo-dependencies.sh install_docker ./forgejo-dependencies.sh install_docker

View file

@ -4,8 +4,6 @@ jobs:
runs-on: self-hosted runs-on: self-hosted
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with:
submodules: 'true'
- run: | - run: |
set -x set -x
LXC_IP_PREFIX=10.0.9 ./forgejo-dependencies.sh LXC_IP_PREFIX=10.0.9 ./forgejo-dependencies.sh

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "lxc-helpers"]
path = lxc-helpers
url = https://code.forgejo.org/forgejo/lxc-helpers

View file

@ -3,7 +3,7 @@
set -x set -x
source $(dirname $0)/lxc-helpers/lxc-helpers-lib.sh source $(dirname $0)/lxc-helpers-lib.sh
: ${LXC_IP_PREFIX:=10.0.8} : ${LXC_IP_PREFIX:=10.0.8}

View file

@ -138,10 +138,10 @@ function push_self_action() {
local tag="$4" local tag="$4"
local dir="$DIR/self" local dir="$DIR/self"
git clone --recurse-submodules . $dir git clone . $dir
( (
cd $dir cd $dir
rm -fr .forgejo .git lxc-helpers/.git rm -fr .forgejo .git
git init git init
git checkout -b main git checkout -b main
git remote add origin "$url/$owner/$self_action" git remote add origin "$url/$owner/$self_action"

@ -1 +0,0 @@
Subproject commit b0766388a2624bc56258053576c7c09dba2e7cf5