Delete submodules from .git and the actual folder before updating

This commit is contained in:
andrewc
2023-10-24 16:01:41 +10:00
parent ecb24b8670
commit c3ce7bc471

View File

@@ -111,6 +111,7 @@ image:
if [[ $GITLAB_CI == 'true' && $CI_COMMIT_BRANCH == "main" ]]; then if [[ $GITLAB_CI == 'true' && $CI_COMMIT_BRANCH == "main" ]]; then
git config --global user.name "KicadCi" git config --global user.name "KicadCi"
git config --global user.email "andrew@micromelon.com.au" git config --global user.email "andrew@micromelon.com.au"
rm -rf .git/modules/libs
for d in "libs/melonlib" "libs/melon3d" for d in "libs/melonlib" "libs/melon3d"
do do
cd $d cd $d
@@ -122,11 +123,8 @@ image:
fi fi
REPO=$(basename $(git remote get-url origin)) REPO=$(basename $(git remote get-url origin))
cd $CI_PROJECT_DIR cd $CI_PROJECT_DIR
rm -rf $d
git submodule set-url $d https://ci_push:$TOKEN@gitlab.com/Micromelon/education/hardware/$REPO git submodule set-url $d https://ci_push:$TOKEN@gitlab.com/Micromelon/education/hardware/$REPO
cd $d
git fetch --all
git pull
cd $CI_PROJECT_DIR
git submodule update --init --remote --merge $d git submodule update --init --remote --merge $d
done done
git submodule status git submodule status