github/schildichat-desktop
1
0
Fork 1
mirror of https://github.com/SchildiChat/schildichat-desktop.git synced 2025-03-31 21:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Checkout release-specific branch names in our repos

Browse Source
This commit is contained in:
SpiritCroc 2024-10-06 12:21:36 +02:00
parent c7181068c6
commit ebc3498510
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
element-desktop

@ -1 +1 @@
Subproject commit 57f3328e37d3f6b1a1f76df82017358236170b70
Subproject commit 093d2e28d82e693b8f7575b1b16206723b9269e5

2
element-web

@ -1 +1 @@
Subproject commit b85184e7579e6d3503bd44f6d283d463eef0558e
Subproject commit 9fa6db056ac4cd2240a9b676cf305a1ca73bc15c

2
matrix-js-sdk

@ -1 +1 @@
Subproject commit 3e11b1c51c4b0f0e673c4b22864f97be7098b888
Subproject commit b6a86ca2e65407999a71d92cbbfec7a856d7a586

2
matrix-react-sdk

@ -1 +1 @@
Subproject commit c6a550e2c3f9020730c8bd603514e9ce7cf69064
Subproject commit abfce03f8cd209ce9289cdcd6a0f4c91e0da6072

9
merge_upstream.sh
View File

@ -34,16 +34,19 @@ if [ -z "$1" ]; then
else
latest_upstream_tag="$1"
fi
forelement_repos git checkout "$latest_upstream_tag"
sc_branch_name="sc_$latest_upstream_tag"
forelement_repos git checkout "$latest_upstream_tag" -B "$sc_branch_name"
get_current_mxsdk_tags
pushd "matrix-js-sdk" > /dev/null
git checkout "$current_mxjssdk_tag"
git checkout "$current_mxjssdk_tag" -B "$sc_branch_name"
popd > /dev/null
pushd "matrix-react-sdk" > /dev/null
git checkout "$current_mxreactsdk_tag"
git checkout "$current_mxreactsdk_tag" -B "$sc_branch_name"
popd > /dev/null
# Refresh environment