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

Use ui_test from crates.io instead of having it in-tree #2449

Merged
merged 1 commit into from Aug 25, 2022

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jul 28, 2022

I have moved a copy of the ui_test crate into a separate repo to facilitate the further non-miri development of it. I will keep syncing until we have reached a point where we don't touch it anymore for miri. At that point we can remove the in-tree version and do further development out of tree.

@oli-obk
Copy link
Contributor Author

oli-obk commented Jul 28, 2022

Hmm weird, it picked up the commits twice. I need to investigate.

@oli-obk oli-obk force-pushed the ui_test_subtree_sync branch 2 times, most recently from 4aaeef1 to 5ad74b0 Compare July 28, 2022 08:20
@oli-obk
Copy link
Contributor Author

oli-obk commented Jul 28, 2022

Hmm weird, it picked up the commits twice. I need to investigate.

Ok I guess we'll always to squash merges when pulling

@RalfJung
Copy link
Member

Ok I guess we'll always to squash merges when pulling

What do you mean by this?

@RalfJung RalfJung added the S-waiting-on-author Status: Waiting for the PR author to address review comments label Aug 22, 2022
@oli-obk
Copy link
Contributor Author

oli-obk commented Aug 24, 2022

What do you mean by this?

when we do a sync with the ui_test repo, we'll only see a single sync commit instead of all the commits that happened on the ui_test side.

@RalfJung
Copy link
Member

RalfJung commented Aug 24, 2022 via email

@oli-obk
Copy link
Contributor Author

oli-obk commented Aug 24, 2022

Aha... So the usual process does not work? Why?

I think because subtree doesn't really work nicely for moving a subfolder out, it is meant for moving a separate repo into a subfolder.

@oli-obk
Copy link
Contributor Author

oli-obk commented Aug 24, 2022

Alternatively, we could just use a cargo git dependency pinned to a particular commit? Or would that make the rustc workspace unhappy?

We could just point to a regular crates.io dependency

@RalfJung
Copy link
Member

Or, that too. You could give me access so I can publish new versions if needed.

@oli-obk
Copy link
Contributor Author

oli-obk commented Aug 25, 2022

You should have an invite

@RalfJung RalfJung changed the title ui_test subtree sync Use ui_test from crates.io instead of having it in-tree Aug 25, 2022
@RalfJung
Copy link
Member

(changed PR title to match)

@RalfJung
Copy link
Member

That repo having its last commit 28 days ago, it probably needs to be synced again?

@oli-obk
Copy link
Contributor Author

oli-obk commented Aug 25, 2022

That repo having its last commit 28 days ago, it probably needs to be synced again?

all tests passed, so I assumed everything necessary was there, but I'll do the push on master before merging this

@RalfJung
Copy link
Member

At least #2505 is not included.

@oli-obk
Copy link
Contributor Author

oli-obk commented Aug 25, 2022

published 0.1.1 with the latest changes.

@RalfJung
Copy link
Member

I confirmed they are in sync. Thanks :)

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 25, 2022

📌 Commit a33fb11 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Aug 25, 2022

⌛ Testing commit a33fb11 with merge f08b413...

bors added a commit that referenced this pull request Aug 25, 2022
Use ui_test from crates.io instead of having it in-tree

I have moved a copy of the `ui_test` crate into [a separate repo](https://github.com/oli-obk/ui_test) to facilitate the further non-miri development of it. I will keep syncing until we have reached a point where we don't touch it anymore for miri. At that point we can remove the in-tree version and do further development out of tree.
@RalfJung
Copy link
Member

RalfJung commented Aug 25, 2022

@bors r- retry
Ah wait can you update the lockfile to use the 0.1.1 version? then r=me

@oli-obk
Copy link
Contributor Author

oli-obk commented Aug 25, 2022

@bors r=RalfJung

@bors
Copy link
Collaborator

bors commented Aug 25, 2022

📌 Commit fb071a1 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Aug 25, 2022

⌛ Testing commit fb071a1 with merge d5853bc...

@bors
Copy link
Collaborator

bors commented Aug 25, 2022

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing d5853bc to master...

@bors bors merged commit d5853bc into rust-lang:master Aug 25, 2022
@oli-obk oli-obk deleted the ui_test_subtree_sync branch October 4, 2022 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: Waiting for the PR author to address review comments
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants