diff --git a/deploy/update-flathub.sh b/deploy/update-flathub.sh index 7451aec..31c4ce5 100755 --- a/deploy/update-flathub.sh +++ b/deploy/update-flathub.sh @@ -20,11 +20,8 @@ debdate=$(date +%Y-%m-%d -r $debpath) pushd "$repopath" > /dev/null git fetch -git checkout master git reset --hard origin/master -git checkout -B "release-v$version" - yamlFile="chat.schildi.desktop.yaml" xmlFile="chat.schildi.desktop.metainfo.xml" @@ -36,8 +33,8 @@ sed -i "s|^\s\s$| \n /dev/null -echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/" +echo "Release v$version published on flathub!" diff --git a/element-desktop b/element-desktop index 07d1283..cbcbe7f 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00 +Subproject commit cbcbe7ff684f4200e362d0bc7178281b2c79d89b diff --git a/element-web b/element-web index d7e4930..8a4c07f 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b +Subproject commit 8a4c07f24559dc0888413f9fc714d1bb6eecfecb diff --git a/generate_changelog.sh b/generate_changelog.sh index 1e65601..3bca794 100755 --- a/generate_changelog.sh +++ b/generate_changelog.sh @@ -16,8 +16,8 @@ forall_repos check_branch $branch forall_repos check_clean_git # Fetch upstream -forall_repos git fetch origin > /dev/null 2>/dev/null -forall_repos git fetch upstream > /dev/null 2>/dev/null +forall_repos git fetch origin > /dev/null +forall_repos git fetch upstream > /dev/null ( # Add new line below git log: https://unix.stackexchange.com/a/345558 diff --git a/i18n-overlays/element-desktop/ja.json b/i18n-overlays/element-desktop/ja.json deleted file mode 100644 index 0967ef4..0000000 --- a/i18n-overlays/element-desktop/ja.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/i18n-overlays/element-web/ja.json b/i18n-overlays/element-web/ja.json deleted file mode 100644 index 0967ef4..0000000 --- a/i18n-overlays/element-web/ja.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/i18n-overlays/matrix-react-sdk/ja.json b/i18n-overlays/matrix-react-sdk/ja.json deleted file mode 100644 index fedc533..0000000 --- a/i18n-overlays/matrix-react-sdk/ja.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Normal priority": "常優先度" -} diff --git a/matrix-js-sdk b/matrix-js-sdk index 1474204..cb81a65 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676 +Subproject commit cb81a65097a0bb861da9e7384cb7469ed42e7a58 diff --git a/matrix-react-sdk b/matrix-react-sdk index c9fb6bb..eb6b8d0 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit c9fb6bbbb8bf97802277127601163618669acdee +Subproject commit eb6b8d0b878102c5fe7420e185667e450f99cf7a