Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ChibiOS update script updates. #24267

Merged
merged 2 commits into from
Aug 12, 2024
Merged

ChibiOS update script updates. #24267

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f1ed3d
Stop mirroring tags, fix up refs to existing branches.
tzarc Aug 11, 2024
16b4b9c
Fixup remote name, remove ChibiOS 20.x sync.
tzarc Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions util/update_chibios_mirror.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@
# Configuration

# The ChibiOS branches to mirror
chibios_branches="trunk stable_20.3.x 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"
chibios_branches="trunk stable_21.11.x"

# The ChibiOS-Contrib branches to mirror
contrib_branches="chibios-20.3.x chibios-21.11.x"
contrib_branches="chibios-21.11.x"

################################
# Actions
Expand Down Expand Up @@ -46,6 +43,12 @@ fi
echo "Updating remotes..."
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..."
git svn fetch

Expand All @@ -56,13 +59,6 @@ for branch in $chibios_branches ; do
&& git push qmk svn-mirror/$branch
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"

if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "qmk"\]')" ]] ; then
Expand Down