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

[Event Hubs] [core-amqp] Update rhea-promise dependency versions #4399

Merged
merged 16 commits into from
Jul 26, 2019

Conversation

ramya0820
Copy link
Member

For more context, refer to #4228

@ramya0820 ramya0820 self-assigned this Jul 23, 2019
@@ -69,7 +69,7 @@
"util": "^0.11.1"
},
"peerDependencies": {
"rhea-promise": "^0.1.15"
"rhea-promise": "^1.0.0"
},
"devDependencies": {
"@azure/identity": "^1.0.0-preview.1",
Copy link
Member

Choose a reason for hiding this comment

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

Please rebase your branch onto current master. This dev dependency should be 1.0.0-preview.2.

common/config/rush/common-versions.json Show resolved Hide resolved
@ramya0820
Copy link
Member Author

ramya0820 commented Jul 24, 2019

@mikeharder Looks like the build is still failing due to the peer dependency not installed issue. As in, rush update is failing to update the lock file with error:

!azure/[email protected] requires a peer of thea-promise@^0.1.15 but none was installed.

Did we have a work around for it yet?

@mikeharder
Copy link
Member

@ramya0820: While we have a solution for different dependency versions (updating versions in master immediately after shipping, we still need to find a solution for different peer dependencies. I will try to create a minimal repro, investigate workarounds, and potentially report the issue to rush and/or pnpm if I believe it's a bug.

@mikeharder
Copy link
Member

@ramya0820: You will probably need to rebase on master and re-run rush update --full to generate a current pnpm-lock.yaml file immediately before checking in, since the file cannot be merged. If the only change since the last successful test run is the new pnpm-lock.yaml file, don't bother to wait for tests, just merge before someone else merges in front of you.

@ramya0820 ramya0820 requested a review from mikeharder July 26, 2019 21:52
@ramya0820 ramya0820 merged commit ed9b69f into Azure:master Jul 26, 2019
mikeharder added a commit to mikeharder/azure-sdk-for-js that referenced this pull request Aug 2, 2019
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.

3 participants