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

fix: v13 -> v14 migration issues (backport #448) #452

Merged
merged 8 commits into from
Apr 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 17, 2023

This is an automatic backport of pull request #448 done by Mergify.
Cherry-pick of ad0767e has failed:

On branch mergify/bp/version-14-hotfix/pr-448
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ad0767e9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/hr/doctype/appraisal_template_goal/appraisal_template_goal.json
	modified:   hrms/patches/v14_0/update_performance_module_changes.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/patches.txt

Cherry-pick of 9884b57 has failed:

On branch mergify/bp/version-14-hotfix/pr-448
Your branch is ahead of 'origin/version-14-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9884b573.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/patches/v14_0/update_performance_module_changes.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/patches.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

- while migrating from v13 if there is existing data > 140 chars in KRA, installation fails because patches cannot run before installation

- add a new Link field key result area

- copy KRA (Small Text)'s trimmed content to new key_result_area Link field

(cherry picked from commit ad0767e)

# Conflicts:
#	hrms/patches.txt
- since it does not need access to old schema now that key_result_area is added as a new field instead of changing the existing one

(cherry picked from commit 9884b57)

# Conflicts:
#	hrms/patches.txt
- patches updating some data should also run post install to avoid leaving data in an inconsistent state during v13 -> v14 migration

(cherry picked from commit 509ea9e)
- if site is created from a backup, all the patches are set as patched in patch log

- so even if the patch has not run on the site, the entry will be present in patch log

(cherry picked from commit 247c0d8)
- add ignore mandatory flags wherever applicable

- clear dt cache after altering table directly

- convert subquery updates to join query updates in QB

- make sure data doesn't get overwritten if patch runs more than once

- remove unnecessary post install patches

(cherry picked from commit 7612a8e)
hrms/patches.txt Outdated Show resolved Hide resolved
@ruchamahabal ruchamahabal merged commit dfe9d90 into version-14-hotfix Apr 17, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-448 branch April 17, 2023 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant