search

mattermost / mattermost-mobile

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

Bump app build and version number #7915

Closed unified-ci-app[bot] closed 1 month ago

unified-ci-app[bot] commented 1 month ago

Summary

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

Release Note

NONE
mattermost-build commented 1 month 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 1 month ago

Cherry pick is scheduled.

mattermost-build commented 1 month 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
   697dcaf33..0a6648276  MM-37809-Theme-Tweaks  -> upstream/MM-37809-Theme-Tweaks
   31e354d4d..194cd7d60  MM-57707-host-controls -> upstream/MM-57707-host-controls
 * [new branch]          chore-bump-main-1713517408 -> upstream/chore-bump-main-1713517408
 * [new branch]          chore-bump-main-1713528737 -> upstream/chore-bump-main-1713528737
   6dcefaf1e..c3e31b681  main                   -> upstream/main
   5cb50fb47..409b3d293  release-2.16           -> upstream/release-2.16
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-#7915-upstream-release-2.16-1713529721
Switched to a new branch 'automated-cherry-pick-of-mattermost-mobile-#7915-upstream-release-2.16-1713529721'
Branch 'automated-cherry-pick-of-mattermost-mobile-#7915-upstream-release-2.16-1713529721' set up to track remote branch 'release-2.16' from 'upstream'.

+++ About to attempt cherry pick of PR #7915 with merge commit c3e31b6813507e51aa6c318becdbdb85f5152946.

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
error: could not apply c3e31b681... Bump app build and version number (#7915)
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.