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 #8595

Merged
merged 2 commits into from
Feb 17, 2025
Merged

Bump app build and version number #8595

merged 2 commits into from
Feb 17, 2025

Conversation

unified-ci-app[bot]
Copy link
Contributor

Summary

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

Release Note

NONE

@unified-ci-app unified-ci-app bot added this to the v2.26.0 milestone Feb 17, 2025
@unified-ci-app unified-ci-app bot added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Feb 17, 2025
@unified-ci-app unified-ci-app bot requested review from amyblais and a team February 17, 2025 06:59
@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.

@unified-ci-app unified-ci-app bot requested review from saturninoabril and mvitale1989 and removed request for a team February 17, 2025 06:59
@amyblais amyblais merged commit 24e6750 into main Feb 17, 2025
32 checks passed
@mattermost-build
Copy link
Contributor

Cherry pick is scheduled.

@amyblais amyblais deleted the chore-bump-main-1739775559 branch February 17, 2025 07:07
@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
 * [new branch]          chore-bump-main-1739775559 -> upstream/chore-bump-main-1739775559
   07c6636fe..179738038  edit_profile_cpa       -> upstream/edit_profile_cpa
   eb51f0622..ef37432e0  feature_schedule_posts -> upstream/feature_schedule_posts
   4f710ef13..24e675048  main                   -> upstream/main
 * [new branch]          notification-helper-cleanup -> upstream/notification-helper-cleanup
   6d8024497..f9b609c5d  release-2.26           -> upstream/release-2.26
 * [new branch]          scheduled_post_feature_popup -> upstream/scheduled_post_feature_popup
   a0c7afa05..c6e2417ac  scheduled_post_sync    -> upstream/scheduled_post_sync
 * [new branch]          scheudled_post_button_fix -> upstream/scheudled_post_button_fix
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-#8595-upstream-release-2.26-1739776019
Switched to a new branch 'automated-cherry-pick-of-mattermost-mobile-#8595-upstream-release-2.26-1739776019'
Branch 'automated-cherry-pick-of-mattermost-mobile-#8595-upstream-release-2.26-1739776019' set up to track remote branch 'release-2.26' from 'upstream'.

+++ About to attempt cherry pick of PR #8595 with merge commit 24e6750482e69e1d5f59dab3f0b7ad8a7c453692.

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 24e675048... Bump app build and version number (#8595)
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 amyblais added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Feb 17, 2025
Willyfrog pushed a commit that referenced this pull request Feb 19, 2025
* Bump app build number to 606

* Bump app version number to 2.26.0

---------

Co-authored-by: Anka <runner@Mac-1739773484484.local>
Rajat-Dabade pushed a commit that referenced this pull request Feb 25, 2025
* Bump app build number to 606

* Bump app version number to 2.26.0

---------

Co-authored-by: Anka <runner@Mac-1739773484484.local>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants