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

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Bump app build and version number #8269

merged 2 commits into from
Oct 18, 2024

Conversation

unified-ci-app[bot]
Copy link
Contributor

Summary

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

Release Note

NONE

@unified-ci-app unified-ci-app bot added this to the v2.22.0 milestone Oct 18, 2024
@unified-ci-app unified-ci-app bot added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Oct 18, 2024
@unified-ci-app unified-ci-app bot requested review from amyblais, a team, mvitale1989 and toninis and removed request for a team October 18, 2024 12:32
@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 e5a7c91 into main Oct 18, 2024
28 checks passed
@mattermost-build
Copy link
Contributor

Cherry pick is scheduled.

@amyblais amyblais deleted the chore-bump-main-1729254682 branch October 18, 2024 12:39
@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]          build-beta-567 -> upstream/build-beta-567
 * [new branch]          chore-bump-main-1729254682 -> upstream/chore-bump-main-1729254682
   c6583b7f9..e5a7c91f1  main           -> upstream/main
   d982efac2..49c4a827d  release-2.22   -> upstream/release-2.22
 * [new tag]             v2.21.0        -> v2.21.0
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
Auto packing the repository in background for optimum performance.
See "git help gc" for manual housekeeping.
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-mobile-#8269-upstream-release-2.22-1729255162
Switched to a new branch 'automated-cherry-pick-of-mattermost-mobile-#8269-upstream-release-2.22-1729255162'
Branch 'automated-cherry-pick-of-mattermost-mobile-#8269-upstream-release-2.22-1729255162' set up to track remote branch 'release-2.22' from 'upstream'.

+++ About to attempt cherry pick of PR #8269 with merge commit e5a7c91f1fe16e6dee4533d6021b66547fe2ad4d.

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 e5a7c91f1... Bump app build and version number (#8269)
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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CherryPick/Approved Meant for 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