search

mattermost / mattermost-mobile

Next generation iOS and Android apps for Mattermost in React Native
https://about.mattermost.com/
Apache License 2.0
2.26k stars 1.37k forks source link

Bump app build and version number #8226

Closed unified-ci-app[bot] closed 2 months ago

unified-ci-app[bot] commented 2 months ago

Summary

Bump app build number to 559 Bump app version number to 2.21.0 Generated by the following Github Actions run: https://github.com/mattermost/delivery-platform/actions/runs/10940327845

Release Note

NONE
mattermost-build commented 2 months ago

Hello @unified-ci-app[bot],

Thanks for your pull request! A Core Committer will review your pull request soon. For code contributions, you can learn more about the review process here.

mattermost-build commented 2 months ago

Cherry pick is scheduled.

mattermost-build commented 2 months ago

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
From github.com:mattermost/mattermost-mobile
   c7cb90416..445e4fe5d  add_e2e_android      -> upstream/add_e2e_android
   6c1736d4d..b0a1a7517  custom-emoji-picker  -> upstream/custom-emoji-picker
   f04838d9b..a4c346e8d  main                 -> upstream/main
   5f4522400..e7eb156c8  reconnectOnNetSwitch -> upstream/reconnectOnNetSwitch
   19009904a..d91023d88  release-2.21         -> upstream/release-2.21
   e1c2a8860..386ea3501  test-random-github-action-experiments -> upstream/test-random-github-action-experiments
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-mobile-#8226-upstream-release-2.21-1726746937
Switched to a new branch 'automated-cherry-pick-of-mattermost-mobile-#8226-upstream-release-2.21-1726746937'
Branch 'automated-cherry-pick-of-mattermost-mobile-#8226-upstream-release-2.21-1726746937' set up to track remote branch 'release-2.21' from 'upstream'.

+++ About to attempt cherry pick of PR #8226 with merge commit a4c346e8d8f4688a49ecc2a1f628bc8308ed1e25.

Auto-merging android/app/build.gradle
CONFLICT (content): Merge conflict in android/app/build.gradle
Auto-merging ios/Mattermost.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in ios/Mattermost.xcodeproj/project.pbxproj
Auto-merging ios/Mattermost/Info.plist
CONFLICT (content): Merge conflict in ios/Mattermost/Info.plist
Auto-merging ios/MattermostShare/Info.plist
CONFLICT (content): Merge conflict in ios/MattermostShare/Info.plist
Auto-merging ios/NotificationService/Info.plist
CONFLICT (content): Merge conflict in ios/NotificationService/Info.plist
Auto-merging package-lock.json
Auto-merging package.json
error: could not apply a4c346e8d... Bump app build and version number (#8226)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

+++ Conflicts detected:

UU android/app/build.gradle
UU ios/Mattermost.xcodeproj/project.pbxproj
UU ios/Mattermost/Info.plist
UU ios/MattermostShare/Info.plist
UU ios/NotificationService/Info.plist
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.
amyblais commented 2 months ago

/cherry-pick release-2.21

mattermost-build commented 2 months ago

Cherry pick is scheduled.

mattermost-build commented 2 months ago

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-mobile-#8226-upstream-release-2.21-1726746976
Switched to a new branch 'automated-cherry-pick-of-mattermost-mobile-#8226-upstream-release-2.21-1726746976'
Branch 'automated-cherry-pick-of-mattermost-mobile-#8226-upstream-release-2.21-1726746976' set up to track remote branch 'release-2.21' from 'upstream'.

+++ About to attempt cherry pick of PR #8226 with merge commit a4c346e8d8f4688a49ecc2a1f628bc8308ed1e25.

Auto-merging android/app/build.gradle
CONFLICT (content): Merge conflict in android/app/build.gradle
Auto-merging ios/Mattermost.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in ios/Mattermost.xcodeproj/project.pbxproj
Auto-merging ios/Mattermost/Info.plist
CONFLICT (content): Merge conflict in ios/Mattermost/Info.plist
Auto-merging ios/MattermostShare/Info.plist
CONFLICT (content): Merge conflict in ios/MattermostShare/Info.plist
Auto-merging ios/NotificationService/Info.plist
CONFLICT (content): Merge conflict in ios/NotificationService/Info.plist
Auto-merging package-lock.json
Auto-merging package.json
error: could not apply a4c346e8d... Bump app build and version number (#8226)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

+++ Conflicts detected:

UU android/app/build.gradle
UU ios/Mattermost.xcodeproj/project.pbxproj
UU ios/Mattermost/Info.plist
UU ios/MattermostShare/Info.plist
UU ios/NotificationService/Info.plist
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.