Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
3a726203a4
|
@ -7,7 +7,7 @@
|
||||||
chibios_branches="trunk stable_20.3.x stable_21.11.x"
|
chibios_branches="trunk stable_20.3.x stable_21.11.x"
|
||||||
|
|
||||||
# The ChibiOS tags to mirror
|
# The ChibiOS tags to mirror
|
||||||
chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver20.3.4 ver21.11.1 ver21.11.2"
|
chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver20.3.4 ver21.11.1 ver21.11.2 ver21.11.3"
|
||||||
|
|
||||||
# The ChibiOS-Contrib branches to mirror
|
# The ChibiOS-Contrib branches to mirror
|
||||||
contrib_branches="chibios-20.3.x chibios-21.11.x"
|
contrib_branches="chibios-20.3.x chibios-21.11.x"
|
||||||
|
@ -32,7 +32,7 @@ contrib_git_config=$(realpath "$contrib_git_location/config")
|
||||||
cd "$chibios_dir"
|
cd "$chibios_dir"
|
||||||
|
|
||||||
if [[ -z "$(cat "$chibios_git_config" | grep '\[svn-remote "svn"\]')" ]] ; then
|
if [[ -z "$(cat "$chibios_git_config" | grep '\[svn-remote "svn"\]')" ]] ; then
|
||||||
git svn init --stdlayout --prefix='svn/' http://svn.osdn.net/svnroot/chibios/
|
git svn init --stdlayout --prefix='svn/' https://svn.code.sf.net/p/chibios/code/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "$(cat "$chibios_git_config" | grep '\[remote "qmk"\]')" ]] ; then
|
if [[ -z "$(cat "$chibios_git_config" | grep '\[remote "qmk"\]')" ]] ; then
|
||||||
|
|
Loading…
Reference in New Issue