Merge remote-tracking branch 'origin/master' into develop
commit
1ac3b3e9b6
|
@ -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..."
|
||||
|
|
Loading…
Reference in New Issue