g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2021-08-29 00:52:22 +00:00
parent 7b8cdfc19d dd8922d482
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" chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver21.6.0"
# The ChibiOS-Contrib branches to mirror # The ChibiOS-Contrib branches to mirror
contrib_branches="master chibios-20.3.x" contrib_branches="chibios-20.3.x"
################################ ################################
# Actions # Actions
@ -38,6 +38,9 @@ fi
if [[ -z "$(cat "$chibios_git_config" | grep '\[remote "qmk"\]')" ]] ; then if [[ -z "$(cat "$chibios_git_config" | grep '\[remote "qmk"\]')" ]] ; then
git remote add qmk git@github.com:qmk/ChibiOS.git git remote add qmk git@github.com:qmk/ChibiOS.git
git remote set-url qmk git@github.com:qmk/ChibiOS.git --push 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 fi
echo "Updating remotes..." echo "Updating remotes..."
@ -65,11 +68,17 @@ cd "$contrib_dir"
if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "qmk"\]')" ]] ; then if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "qmk"\]')" ]] ; then
git remote add qmk git@github.com:qmk/ChibiOS-Contrib.git git remote add qmk git@github.com:qmk/ChibiOS-Contrib.git
git remote set-url qmk git@github.com:qmk/ChibiOS-Contrib.git --push 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 fi
if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "upstream"\]')" ]] ; then if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "upstream"\]')" ]] ; then
git remote add upstream git@github.com:ChibiOS/ChibiOS-Contrib.git git remote add upstream git@github.com:ChibiOS/ChibiOS-Contrib.git
git remote set-url upstream git@github.com:ChibiOS/ChibiOS-Contrib.git --push 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 fi
echo "Updating remotes..." echo "Updating remotes..."