poz/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 2024-08-12 10:36:29 +00:00
commit ca6ba30a72
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
util/update_chibios_mirror.sh
View file

@ -4,13 +4,10 @@
# Configuration # Configuration
# The ChibiOS branches to mirror # The ChibiOS branches to mirror
chibios_branches="trunk stable_20.3.x stable_21.11.x" chibios_branches="trunk stable_21.11.x"
# 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 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-21.11.x"
################################ ################################
# Actions # Actions
@ -46,6 +43,12 @@ fi
echo "Updating remotes..." echo "Updating remotes..."
git fetch --all --tags --prune git fetch --all --tags --prune
echo "Ensure refs actually match up..."
for branch in $chibios_branches ; do
echo "Matching $branch..."
git update-ref refs/remotes/svn/$branch refs/remotes/qmk/svn-mirror/$branch
done
echo "Fetching latest from subversion..." echo "Fetching latest from subversion..."
git svn fetch git svn fetch
@ -56,13 +59,6 @@ for branch in $chibios_branches ; do
&& git push qmk svn-mirror/$branch && git push qmk svn-mirror/$branch
done done
echo "Updating ChibiOS tags..."
for tagname in $chibios_tags ; do
echo "Creating tag 'svn-mirror/$tagname' from 'svn/tags/$tagname'..."
GIT_COMMITTER_DATE="$(git log -n1 --pretty=format:'%ad' svn/tags/$tagname)" git tag -f -a -m "Tagging $tagname" svn-mirror/$tagname svn/tags/$tagname
git push qmk svn-mirror/$tagname
done
cd "$contrib_dir" cd "$contrib_dir"
if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "qmk"\]')" ]] ; then if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "qmk"\]')" ]] ; then