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

Sync with the v2.x branch #1361

Merged
merged 2 commits into from
May 31, 2023
Merged

Conversation

NullVoxPopuli
Copy link
Sponsor Collaborator

Some confusing comparisons:

I reviewed the code with the following commits, starting with the first one I did not see in my skim of the tgit log on master:

the only changes missing that I could find that was missing (from looking at the diff of each commit and checking if the code on master matched) was the changelog / package.json changes.

@NullVoxPopuli
Copy link
Sponsor Collaborator Author

Can someone re-run the build here? https://github.com/emberjs/ember-test-helpers/actions/runs/4516904757/jobs/7955705788?pr=1361

The failure is sus, based on the changes in this PR

@MelSumner MelSumner added the v3 label May 30, 2023
@MelSumner
Copy link
Contributor

I don't think I can re-run the test, been too long maybe? @NullVoxPopuli can you make sure this is branch is updated with current master and re-push? That should jiggle things to get them running.

@NullVoxPopuli
Copy link
Sponsor Collaborator Author

NullVoxPopuli commented May 31, 2023

looks like an extra commit snuck in, idk how that happened
gonna remove it.

This is the PR it somehow pulled in: #1382
maybe I did a rebase goof. This repo is set up slightly different form my standard

Copy link
Contributor

@MelSumner MelSumner left a comment

Choose a reason for hiding this comment

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

🎉 Thank you!

@MelSumner MelSumner merged commit b3a7236 into emberjs:master May 31, 2023
13 checks passed
@NullVoxPopuli NullVoxPopuli deleted the sync-with-v2-x branch May 31, 2023 00:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants