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

Merged
merged 2 commits into from
Jan 22, 2024
Merged

Conversation

unified-ci-app[bot]
Copy link
Contributor

Summary

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

Release Note

NONE

@unified-ci-app unified-ci-app bot added this to the v2.13.0 milestone Jan 22, 2024
@unified-ci-app unified-ci-app bot added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Jan 22, 2024
@unified-ci-app unified-ci-app bot requested a review from a team January 22, 2024 15:00
@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 added the 4: Reviews Complete All reviewers have approved the pull request label Jan 22, 2024
@mvitale1989 mvitale1989 merged commit f94e368 into main Jan 22, 2024
13 checks passed
@mvitale1989 mvitale1989 deleted the chore-bump-main-1705935556 branch January 22, 2024 15:05
@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
 * [new branch]          build-release-502 -> upstream/build-release-502
 * [new branch]          chore-bump-release-2.12-1705920641 -> upstream/chore-bump-release-2.12-1705920641
   73c9bf058..f94e3688e  main              -> upstream/main
   3eea0cc93..28cc82734  release-2.12      -> upstream/release-2.12
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-#7779-upstream-release-2.13-1705935959
Switched to a new branch 'automated-cherry-pick-of-mattermost-mobile-#7779-upstream-release-2.13-1705935959'
Branch 'automated-cherry-pick-of-mattermost-mobile-#7779-upstream-release-2.13-1705935959' set up to track remote branch 'release-2.13' from 'upstream'.

+++ About to attempt cherry pick of PR #7779 with merge commit f94e3688e395703eed412fcfb4ce5a6378aa2c64.

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 f94e3688e... Bump app build and version number (#7779)
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
Copy link
Member

I'll reproduce these changes on top of the release-2.13 branch

juliovillalvazo pushed a commit to juliovillalvazo/mattermost-mobile that referenced this pull request Feb 14, 2024
* Bump app build number to 503

* Bump app version number to 2.13.0

---------

Co-authored-by: runner <runner@Mac-1705935432189.local>
@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 May 17, 2024
cyrusjc pushed a commit to cyrusjc/mattermost-mobile that referenced this pull request May 18, 2024
* Bump app build number to 503

* Bump app version number to 2.13.0

---------

Co-authored-by: runner <runner@Mac-1705935432189.local>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4: Reviews Complete All reviewers have approved the pull request 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.

4 participants