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

WIP: Fix automatic upgrade #5966

Merged
merged 3 commits into from
Jun 23, 2017
Merged

WIP: Fix automatic upgrade #5966

merged 3 commits into from
Jun 23, 2017

Conversation

TranQuangTienSA
Copy link
Contributor

Fix #5883

  • Please make sure the below checklist is followed for Pull Requests.

  • Travis tests are green

  • Tests are added where necessary

  • Coding Rules & Commit Guidelines as per our CONTRIBUTING.md document are followed

@TranQuangTienSA TranQuangTienSA changed the title Fix automatic upgrade [WIP] Fix automatic upgrade Jun 22, 2017
@TranQuangTienSA
Copy link
Contributor Author

TranQuangTienSA commented Jun 22, 2017

Tested on:

  • Upgrade from 4.5.2 to 4.5.5
  • Upgrade from 4.4.0 to 4.5.5
  • Upgrade project that has conflict in package.json. The final step install will be failed.

@TranQuangTienSA TranQuangTienSA changed the title [WIP] Fix automatic upgrade WIP: Fix automatic upgrade Jun 22, 2017
@jdubois
Copy link
Member

jdubois commented Jun 22, 2017

That issue is the biggest one we had in the recent months, and nobody could fix yet (including me!). If you solved this, many people will thank you!!!

@jdubois
Copy link
Member

jdubois commented Jun 22, 2017

@tientq have a look at https://travis-ci.org/jhipster/generator-jhipster/jobs/245617623 you have some lint issues

@TranQuangTienSA
Copy link
Contributor Author

Yes, thank for your remind.

@@ -32,6 +32,7 @@ util.inherits(UpgradeGenerator, BaseGenerator);
const GENERATOR_JHIPSTER = 'generator-jhipster';
const UPGRADE_BRANCH = 'jhipster_upgrade';
const GIT_VERSION_NOT_ALLOW_MERGE_UNRELATED_HISTORIES = '2.9.0';
const GENERATOR_JHIPSTER_CLI_VERSION = '4.5.1';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the current JHipster version, it's already in package.json and should be available (I'll have a look)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh sorry, I didn't understood correctly, this is good

@jdubois
Copy link
Member

jdubois commented Jun 23, 2017

I just tried it:

  • It worked!!!! Yeah!!!!!!!!
  • Only issue is that my yarn.lock wasn't commited, but that's a very minor point, and it would be easy to solve
  • I didn't test any edge cases, just did from v4.5.2 to the current v4.5.5

So I'm merging this: whatever problems we might encounter, it's still much better than the current code.

THANK YOU SO MUCH @tientq !!!!!!!!

@jdubois jdubois merged commit 4187509 into jhipster:master Jun 23, 2017
@TranQuangTienSA
Copy link
Contributor Author

You are welcome.

@jdubois jdubois modified the milestone: 4.5.6 Jun 23, 2017
@TranQuangTienSA TranQuangTienSA mentioned this pull request Jul 11, 2017
3 tasks
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.

2 participants