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

Clarify authors. #206

Merged
merged 2 commits into from
Jan 5, 2021
Merged

Clarify authors. #206

merged 2 commits into from
Jan 5, 2021

Conversation

vext01
Copy link
Contributor

@vext01 vext01 commented Dec 21, 2020

The main change is 3fbad79, then there's a commit to make the README overview better.

ykview/Cargo.toml Outdated Show resolved Hide resolved
README.md Outdated

## Contributors

Yorick is developed by the Software Development Team at King's College London,
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can be more inclusive here. Maybe something like "Yorick is developed by a team of people which can be seen in the ." I don't think we need a special mention.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in 12d05fc

@ltratt
Copy link
Contributor

ltratt commented Dec 21, 2020

Please squash.

All Cargo manifests now list "The Yorick Developers" and we provide a
link to the Github contributors page in the README.
@vext01
Copy link
Contributor Author

vext01 commented Dec 21, 2020

splat.

@ltratt
Copy link
Contributor

ltratt commented Dec 21, 2020

bors r+

bors bot added a commit that referenced this pull request Dec 21, 2020
206: Clarify authors. r=ltratt a=vext01



Co-authored-by: Edd Barrett <vext01@gmail.com>
@bors
Copy link
Contributor

bors bot commented Dec 21, 2020

Build failed:

@vext01
Copy link
Contributor Author

vext01 commented Dec 21, 2020

bors try

bors bot added a commit that referenced this pull request Dec 21, 2020
@bors
Copy link
Contributor

bors bot commented Dec 21, 2020

try

Build failed:

@ltratt
Copy link
Contributor

ltratt commented Dec 22, 2020

cargo not being found is a bit odd! Let's try again.

bors r+

bors bot added a commit that referenced this pull request Dec 22, 2020
206: Clarify authors. r=ltratt a=vext01



Co-authored-by: Edd Barrett <vext01@gmail.com>
@bors
Copy link
Contributor

bors bot commented Dec 22, 2020

Build failed:

@vext01
Copy link
Contributor Author

vext01 commented Dec 22, 2020 via email

@vext01
Copy link
Contributor Author

vext01 commented Dec 23, 2020

Made a little progress with this. Something seems to have changed with x.py install such that the directory we tar up for the CI snapshot is bogus, and only contains:

$ find build/ykrustc-stage2-latest/
build/ykrustc-stage2-latest/
build/ykrustc-stage2-latest/libexec
build/ykrustc-stage2-latest/libexec/cargo-credential-1password
build/ykrustc-stage2-latest/VERSION

I also notice something wrong with the CI snapshot directory:

-rwxrwxr-x  1 buildbot-worker1 buildbot-workers 124643091 Dec 15 17:18 ykrustc-hw-stage2-1b4b37bf.tar.bz2
-rwxrwxr-x  1 buildbot-worker3 buildbot-workers 124650393 Dec 15 17:26 ykrustc-hw-stage2-5ccb675d.tar.bz2
-rwxrwxr-x  1 buildbot-worker4 buildbot-workers 124634002 Dec 15 17:23 ykrustc-hw-stage2-60d5035b.tar.bz2
-rwxrwxr-x  1 buildbot-worker4 buildbot-workers    298379 Dec 21 13:48 ykrustc-hw-stage2-92cb5763.tar.bz2
-rwxrwxr-x  1 buildbot-worker1 buildbot-workers 124638644 Dec 21 13:10 ykrustc-hw-stage2-b7178dda.tar.bz2
-rwxrwxr-x  1 buildbot-worker2 buildbot-workers 124786567 Dec 17 14:59 ykrustc-hw-stage2-ec7fe7f5.tar.bz2
lrwxrwxrwx  1 buildbot-worker4 buildbot-workers        61 Dec 21 13:48 ykrustc-hw-stage2-latest.tar.bz2 -> /opt/ykrustc-bin-snapshots/ykrustc-hw-stage2-92cb5763.tar.bz2
-rwxrwxr-x  1 buildbot-worker2 buildbot-workers 124668885 Dec 16 07:21 ykrustc--stage2-5ccb675d.tar.bz2
-rwxrwxr-x  1 buildbot-worker3 buildbot-workers    298217 Dec 23 07:21 ykrustc--stage2-92cb5763.tar.bz2
lrwxrwxrwx  1 buildbot-worker3 buildbot-workers        59 Dec 23 07:21 ykrustc--stage2-latest.tar.bz2 -> /opt/ykrustc-bin-snapshots/ykrustc--stage2-92cb5763.tar.bz2

My guess there is that the removal of STD_TRACER_MODE wasn't done quite right.

Out of time for now :)

@ltratt
Copy link
Contributor

ltratt commented Dec 23, 2020

Aha, OK!

@vext01
Copy link
Contributor Author

vext01 commented Dec 30, 2020

I've been slowly investigating this. It seems the installer is currently in flux, and this is likely the source of our problems: https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/.60x.2Epy.20install.60.20broken.3F

@ltratt
Copy link
Contributor

ltratt commented Dec 30, 2020

It looks like there's a PR fix up now? rust-lang/rust#80514

@vext01
Copy link
Contributor Author

vext01 commented Dec 30, 2020 via email

@ltratt
Copy link
Contributor

ltratt commented Jan 1, 2021

I've checked and rust-lang/rust#80514 has been merged into rust's master branch, even though the PR is still open. So I think we're good to go!

@vext01
Copy link
Contributor Author

vext01 commented Jan 1, 2021

Using this morning's upstream master, x.py install no longer fails, but it doesn't actually put anything in the install dir.

@ltratt
Copy link
Contributor

ltratt commented Jan 1, 2021

Ye gods :/

@vext01
Copy link
Contributor Author

vext01 commented Jan 5, 2021

bors try

bors bot added a commit that referenced this pull request Jan 5, 2021
@bors
Copy link
Contributor

bors bot commented Jan 5, 2021

try

Build succeeded:

@vext01
Copy link
Contributor Author

vext01 commented Jan 5, 2021

@ltratt this is good to go.

@ltratt
Copy link
Contributor

ltratt commented Jan 5, 2021

Do you want/need to rebase against master?

@vext01
Copy link
Contributor Author

vext01 commented Jan 5, 2021

It's already up to date, so we can go ahead.

@ltratt
Copy link
Contributor

ltratt commented Jan 5, 2021

bors r+

@bors
Copy link
Contributor

bors bot commented Jan 5, 2021

Build succeeded:

@bors bors bot merged commit 89ffa9f into ykjit:master Jan 5, 2021
@vext01 vext01 deleted the authors branch January 5, 2021 16:04
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