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

Use new helpers in merge script

Browse Source
This commit is contained in:
su-ex 2021-09-28 17:26:53 +02:00
parent d674744588
commit 32a1898fc0
No known key found for this signature in database
GPG Key ID: D743C50C8B61984C
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
merge_upstream.sh
View File

@ -16,19 +16,23 @@ forall_repos check_branch $branch
# Ensure clean git state # Ensure clean git state
forall_repos check_clean_git forall_repos check_clean_git
# Automatic i18n reversion # Fetch upstream
automatic_i18n_reversion
# Merge
forall_repos git fetch upstream forall_repos git fetch upstream
# Automatic reversions
automatic_i18n_reversion
automatic_packagejson_reversion
# Merge upstream
forall_repos git merge upstream/master forall_repos git merge upstream/master
# Refresh environment # Refresh environment
make clean make clean
make setup make setup
# Automatic i18n adjustment # Automatic adjustments
automatic_i18n_adjustment automatic_i18n_adjustment
automatic_packagejson_adjustment
# Automatic theme update # Automatic theme update
pushd "matrix-react-sdk" > /dev/null pushd "matrix-react-sdk" > /dev/null