Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump app build and version number #8226

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Bump app build and version number #8226

merged 2 commits into from
Sep 19, 2024

Conversation

unified-ci-app[bot]
Copy link
Contributor

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

@unified-ci-app unified-ci-app bot added this to the v2.21.0 milestone Sep 19, 2024
@unified-ci-app unified-ci-app bot added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Sep 19, 2024
@unified-ci-app unified-ci-app bot requested review from amyblais and a team September 19, 2024 11:49
@mattermost-build
Copy link
Contributor

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.

@amyblais amyblais merged commit a4c346e into main Sep 19, 2024
20 checks passed
@amyblais amyblais deleted the chore-bump-main-1726746502 branch September 19, 2024 11:55
@mattermost-build
Copy link
Contributor

Cherry pick is scheduled.

@mattermost-build
Copy link
Contributor

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
Copy link
Member

/cherry-pick release-2.21

@mattermost-build
Copy link
Contributor

Cherry pick is scheduled.

@mattermost-build
Copy link
Contributor

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.

@mvitale1989 mvitale1989 removed the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Sep 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants