Trying changing submodule url in push libs job, before updating with

remote
This commit is contained in:
andrewc
2023-10-24 15:33:39 +10:00
parent d6e8e0d96f
commit e5358000ef

View File

@@ -16,12 +16,6 @@ stages:
- gen_fab - gen_fab
- release - release
default:
before_script:
- git submodule update --init --remote --merge
- git submodule status
- git submodule foreach git log -1
image: image:
name: ghcr.io/inti-cmnb/kicad7_auto:1.6.3 name: ghcr.io/inti-cmnb/kicad7_auto:1.6.3
@@ -117,7 +111,6 @@ 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"
cd $CI_PROJECT_DIR
for d in "libs/melonlib" "libs/melon3d" for d in "libs/melonlib" "libs/melon3d"
do do
cd $d cd $d
@@ -128,8 +121,16 @@ image:
TOKEN=$KI_LIB_3D_TOKEN TOKEN=$KI_LIB_3D_TOKEN
fi fi
REPO=$(basename $(git remote get-url origin)) REPO=$(basename $(git remote get-url origin))
git remote set-url origin https://ci_push:$TOKEN@gitlab.com/Micromelon/education/hardware/$REPO cd $CI_PROJECT_DIR
git fetch origin git submodule set-url $d https://ci_push:$TOKEN@gitlab.com/Micromelon/education/hardware/$REPO
done
git submodule update --init --remote --merge
git submodule status
git submodule foreach git log -1
cd $CI_PROJECT_DIR
for d in "libs/melonlib" "libs/melon3d"
do
cd $d
CURR_B=$(git branch --remote --verbose --no-abbrev --contains | sed -rne 's/^[^\/]*\/([^\ ]+).*$/\1/p') CURR_B=$(git branch --remote --verbose --no-abbrev --contains | sed -rne 's/^[^\/]*\/([^\ ]+).*$/\1/p')
git rev-parse HEAD git rev-parse HEAD
git branch -a git branch -a