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.

Sign up for GitHub

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

Jump to bottom

Fix not running some steps in CI #48252

Merged
merged 3 commits into from
Feb 16, 2018
Merged

Fix not running some steps in CI #48252

merged 3 commits into from
Feb 16, 2018

Conversation

Mark-Simulacrum
Copy link
Member

We'd previously assumed that these paths would be relative to the src
dir, and that for example our various CI scripts would, when calling
x.py, use ../x.py build ../src/tools/... but this isn't the case --
they use ../x.py without using the relevant source-relative path.

We eventually may want to make this (actually somewhat logical) change,
but this is not that time.

r? @kennytm

@Mark-Simulacrum
Prevent silently ignoring unmatched paths
e78ecd2 
Primarily for CI purposes; this is intended to avoid cases where we
update rustbuild and unintentionally make CI stop running some builds to
the arguments being passed no longer applying for some reason.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 16, 2018
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=50

I'm going to go ahead and r=me this since it's a fairly critical patch that makes our CI properly test wasm, for example.

@bors
Copy link
Contributor

bors commented Feb 16, 2018

📌 Commit 8b7c361 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 16, 2018
@Mark-Simulacrum
Consider paths passed to x.py to be root-relative.
366a656 
We'd previously assumed that these paths would be relative to the src
dir, and that for example our various CI scripts would, when calling
x.py, use `../x.py build ../src/tools/...` but this isn't the case --
they use `../x.py` without using the relevant source-relative path.

We eventually may want to make this (actually somewhat logical) change,
but this is not that time.
@Mark-Simulacrum
Copy link
Member Author

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Feb 16, 2018

📌 Commit 366a656 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Feb 16, 2018

⌛ Testing commit 366a656 with merge b2c1df3531f1c50037daff1bb829c6797f9e9118...

@bors
Copy link
Contributor

bors commented Feb 16, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 16, 2018
@kennytm
Copy link
Member

kennytm commented Feb 16, 2018 

thread 'main' panicked at 'index out of bounds: the len is 0 but the index is 0', bootstrap\builder.rs:388:12

@kennytm
Copy link
Member

kennytm commented Feb 16, 2018 •
edited
Loading

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Feb 16, 2018

📌 Commit f14b06e has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 16, 2018
@bors
Copy link
Contributor

bors commented Feb 16, 2018

📌 Commit c788433 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Feb 16, 2018

⌛ Testing commit c788433 with merge e5b1cd8975fb466628029635c3c40560a4167d6e...

@bors
Copy link
Contributor

bors commented Feb 16, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 16, 2018
@pnkfelix pnkfelix mentioned this pull request Feb 16, 2018
Closed
@pnkfelix
Copy link
Member

my hope is that this PR will also fix issue #48268

@kennytm
Copy link
Member

kennytm commented Feb 16, 2018

@bors retry #46903

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 16, 2018
@pnkfelix
Copy link
Member

pnkfelix commented Feb 16, 2018 •
edited
Loading

build timed out, lets retry it. (Update: hup, @kennytm beat me to it.)

@pnkfelix
Copy link
Member

@Mark-Simulacrum your description seems to imply that if my old workflow for invoking tidy from a non-std directory, then the interim workaround would be to add an appropriate prefix to the path to tidy.

E.g. if I used to do ../x.py test src/tools/tidy, then I should now start doing ../x.py test ../src/tools/tidy (at least until some PR, perhaps this one, lands that fixes #48268)

But from my own local experimentation, the above assertion is not correct:

% pwd
/Users/fklock/Dev/Mozilla/rust.git/objdir-dbgopt
% ../x.py test ../src/tools/tidy
Updating submodules
    Finished dev [unoptimized] target(s) in 0.0 secs
Warning: no rules matched objdir-dbgopt/../src/tools/tidy.
Build completed successfully in 0:00:05
% ../x.py test src/tools/tidy
Updating submodules
    Finished dev [unoptimized] target(s) in 0.0 secs
Warning: no rules matched objdir-dbgopt/src/tools/tidy.
Build completed successfully in 0:00:04

@Mark-Simulacrum
Copy link
Member Author

Ah, we needed to path-clean those. I was close, but I guess we don't consider those two paths equivalent.

@bors
Copy link
Contributor

bors commented Feb 16, 2018

⌛ Testing commit c788433 with merge 58a8e0c...

bors added a commit that referenced this pull request Feb 16, 2018
@bors
Auto merge of #48252 - Mark-Simulacrum:exclude-paths, r=alexcrichton
58a8e0c 
Fix not running some steps in CI

We'd previously assumed that these paths would be relative to the src
dir, and that for example our various CI scripts would, when calling
x.py, use `../x.py build ../src/tools/...` but this isn't the case --
they use `../x.py` without using the relevant source-relative path.

We eventually may want to make this (actually somewhat logical) change,
but this is not that time.

r? @kennytm
@bors
Copy link
Contributor

bors commented Feb 16, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 58a8e0c to master...

@bors bors merged commit c788433 into rust-lang:master Feb 16, 2018
@Mark-Simulacrum Mark-Simulacrum added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Feb 18, 2018
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Feb 18, 2018
Merged
bors added a commit that referenced this pull request Feb 19, 2018
@bors
Auto merge of #48340 - Mark-Simulacrum:beta-next, r=kennytm
030fc63 
[beta] Backport #48252

Backport of #48252. It fixes a critical failure in what we run on CI that was caught after we branched beta.
bors added a commit that referenced this pull request Feb 19, 2018
@bors
Auto merge of #48340 - Mark-Simulacrum:beta-next, r=kennytm
1e8fbb1 
[beta] Backport #48252

Backport of #48252. It fixes a critical failure in what we run on CI that was caught after we branched beta.
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 27, 2018
@Mark-Simulacrum Mark-Simulacrum deleted the exclude-paths branch June 8, 2019 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kennytm kennytm

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Mark-Simulacrum @bors @kennytm @pnkfelix @alexcrichton @rust-highfive