darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-08-29 00:52:22 +00:00
commit 1ac3b3e9b6
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
util/update_chibios_mirror.sh
View file

@ -10,7 +10,7 @@ chibios_branches="trunk stable_20.3.x stable_21.6.x"
chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver21.6.0"
# The ChibiOS-Contrib branches to mirror
contrib_branches="master chibios-20.3.x"
contrib_branches="chibios-20.3.x"
################################
# Actions
@ -38,6 +38,9 @@ fi
if [[ -z "$(cat "$chibios_git_config" | grep '\[remote "qmk"\]')" ]] ; then
git remote add qmk git@github.com:qmk/ChibiOS.git
git remote set-url qmk git@github.com:qmk/ChibiOS.git --push
else
git remote set-url qmk git@github.com:qmk/ChibiOS.git
git remote set-url qmk git@github.com:qmk/ChibiOS.git --push
fi
echo "Updating remotes..."
@ -65,11 +68,17 @@ cd "$contrib_dir"
if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "qmk"\]')" ]] ; then
git remote add qmk git@github.com:qmk/ChibiOS-Contrib.git
git remote set-url qmk git@github.com:qmk/ChibiOS-Contrib.git --push
else
git remote set-url qmk git@github.com:qmk/ChibiOS-Contrib.git
git remote set-url qmk git@github.com:qmk/ChibiOS-Contrib.git --push
fi
if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "upstream"\]')" ]] ; then
git remote add upstream git@github.com:ChibiOS/ChibiOS-Contrib.git
git remote set-url upstream git@github.com:ChibiOS/ChibiOS-Contrib.git --push
else
git remote set-url upstream git@github.com:ChibiOS/ChibiOS-Contrib.git
git remote set-url upstream git@github.com:ChibiOS/ChibiOS-Contrib.git --push
fi
echo "Updating remotes..."