Skip to content

Clarify authors. - #206

Merged
bors[bot] merged 2 commits into
ykjit:masterfrom
vext01:authors
Jan 5, 2021
Merged

Clarify authors.#206
bors[bot] merged 2 commits into
ykjit:masterfrom
vext01:authors

Conversation

@vext01

@vext01 vext01 commented Dec 21, 2020

Copy link
Copy Markdown
Contributor

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

Comment thread ykview/Cargo.toml Outdated
Comment thread README.md Outdated

## Contributors

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

Copy link
Copy Markdown
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
Copy Markdown
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

ltratt commented Dec 21, 2020

Copy link
Copy Markdown
Contributor

Please squash.

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

vext01 commented Dec 21, 2020

Copy link
Copy Markdown
Contributor Author

splat.

@ltratt

ltratt commented Dec 21, 2020

Copy link
Copy Markdown
Contributor

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

bors Bot commented Dec 21, 2020

Copy link
Copy Markdown
Contributor

Build failed:

@vext01

vext01 commented Dec 21, 2020

Copy link
Copy Markdown
Contributor Author

bors try

bors Bot added a commit that referenced this pull request Dec 21, 2020
@bors

bors Bot commented Dec 21, 2020

Copy link
Copy Markdown
Contributor

try

Build failed:

@ltratt

ltratt commented Dec 22, 2020

Copy link
Copy Markdown
Contributor

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

bors Bot commented Dec 22, 2020

Copy link
Copy Markdown
Contributor

Build failed:

@vext01

vext01 commented Dec 22, 2020 via email

Copy link
Copy Markdown
Contributor Author

@vext01

vext01 commented Dec 23, 2020

Copy link
Copy Markdown
Contributor Author

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

ltratt commented Dec 23, 2020

Copy link
Copy Markdown
Contributor

Aha, OK!

@vext01

vext01 commented Dec 30, 2020

Copy link
Copy Markdown
Contributor Author

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

ltratt commented Dec 30, 2020

Copy link
Copy Markdown
Contributor

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

@vext01

vext01 commented Dec 30, 2020 via email

Copy link
Copy Markdown
Contributor Author

@ltratt

ltratt commented Jan 1, 2021

Copy link
Copy Markdown
Contributor

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

vext01 commented Jan 1, 2021

Copy link
Copy Markdown
Contributor Author

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

@ltratt

ltratt commented Jan 1, 2021

Copy link
Copy Markdown
Contributor

Ye gods :/

@vext01

vext01 commented Jan 5, 2021

Copy link
Copy Markdown
Contributor Author

bors try

bors Bot added a commit that referenced this pull request Jan 5, 2021
@bors

bors Bot commented Jan 5, 2021

Copy link
Copy Markdown
Contributor

try

Build succeeded:

@vext01

vext01 commented Jan 5, 2021

Copy link
Copy Markdown
Contributor Author

@ltratt this is good to go.

@ltratt

ltratt commented Jan 5, 2021

Copy link
Copy Markdown
Contributor

Do you want/need to rebase against master?

@vext01

vext01 commented Jan 5, 2021

Copy link
Copy Markdown
Contributor Author

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

@ltratt

ltratt commented Jan 5, 2021

Copy link
Copy Markdown
Contributor

bors r+

@bors

bors Bot commented Jan 5, 2021

Copy link
Copy Markdown
Contributor

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