Skip to content

Update embroider monorepo to v0.42.0 #3711

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

Merged
merged 1 commit into from
Jun 16, 2021
Merged

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Jun 15, 2021

WhiteSource Renovate

This PR contains the following updates:

Package Change Age Adoption Passing Confidence
@embroider/compat 0.41.0 -> 0.42.0 age adoption passing confidence
@embroider/core 0.41.0 -> 0.42.0 age adoption passing confidence
@embroider/webpack 0.41.0 -> 0.42.0 age adoption passing confidence

Release Notes

embroider-build/embroider

v0.42.0

Compare Source

💥 Breaking Change
  • addon-shim, babel-loader-7, compat, core, hbs-loader, macros, router, shared-internals, test-setup, util, webpack
🐛 Bug Fix
🏠 Internal
Committers: 4

Configuration

📅 Schedule: At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about these updates again.


  • If you want to rebase/retry this PR, check this box.

This PR has been generated by WhiteSource Renovate. View repository job log here.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @smarnach (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@Turbo87
Copy link
Member

Turbo87 commented Jun 15, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Jun 15, 2021

📌 Commit 2225b90 has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Jun 15, 2021

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout renovate/embroider-monorepo (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self renovate/embroider-monorepo --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging yarn.lock
CONFLICT (content): Merge conflict in yarn.lock
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Jun 15, 2021

☔ The latest upstream changes (presumably #3709) made this pull request unmergeable. Please resolve the merge conflicts.

@renovate renovate bot force-pushed the renovate/embroider-monorepo branch from 2225b90 to 60e97d0 Compare June 15, 2021 23:39
@Turbo87
Copy link
Member

Turbo87 commented Jun 16, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Jun 16, 2021

📌 Commit 60e97d0 has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Jun 16, 2021

⌛ Testing commit 60e97d0 with merge 828e2f5...

@bors
Copy link
Contributor

bors commented Jun 16, 2021

☀️ Test successful - checks-actions
Approved by: Turbo87
Pushing 828e2f5 to master...

@bors bors merged commit 828e2f5 into master Jun 16, 2021
@renovate renovate bot deleted the renovate/embroider-monorepo branch June 16, 2021 16:02
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.

5 participants