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

Remove strictly-unnecessary flags for docker #39036

Merged
merged 1 commit into from
Jan 13, 2017

Conversation

aidanhs
Copy link
Member

@aidanhs aidanhs commented Jan 13, 2017

cc #39035

In addition to --tty I've removed --interactive as I don't think there's any reason for it to be there (it only hooks up stdin, which shouldn't be used anyway).

If this looks like it's working over a few days then I'll also alter the libc scripts.

r? @alexcrichton

@alexcrichton
Copy link
Member

Oh I tend to like to leave --interactive in there for when I'm debugging the containers and have to run the scripts locally. Is something like that known to cause problems though? If so then we can always just have edits locally if need be.

@aidanhs
Copy link
Member Author

aidanhs commented Jan 13, 2017

If by 'debugging' you mean 'dropping into a shell in the container' you'll need to re-add --tty anyway, interactive by itself is only useful if piping input to a command in the container (if you do do this, I'll leave it in).

@alexcrichton
Copy link
Member

Ah ok, makes sense. When debugging anyway I have to change something to exec bash regardless so changing here seems reasonable as well. Let's see if it works!

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Jan 13, 2017

📌 Commit 8539ce8 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jan 13, 2017

⌛ Testing commit 8539ce8 with merge c54a9c7...

@steveklabnik
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Jan 13, 2017

⌛ Testing commit 8539ce8 with merge 8780962...

bors added a commit that referenced this pull request Jan 13, 2017
Remove strictly-unnecessary flags for docker

cc #39035

In addition to `--tty` I've removed `--interactive` as I don't think there's any reason for it to be there (it only hooks up stdin, which shouldn't be used anyway).

If this looks like it's working over a few days then I'll also alter the libc scripts.

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Jan 13, 2017

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

@bors bors merged commit 8539ce8 into rust-lang:master Jan 13, 2017
@aidanhs aidanhs deleted the aphs-robust-docker branch January 13, 2017 22:14
aidanhs added a commit to aidanhs/cargo that referenced this pull request Apr 23, 2017
bors added a commit to rust-lang/cargo that referenced this pull request Apr 23, 2017
aidanhs added a commit to aidanhs/libc that referenced this pull request Apr 23, 2017
bors added a commit to rust-lang/libc that referenced this pull request Apr 23, 2017
kennytm added a commit to kennytm/rust that referenced this pull request May 21, 2017
* Bring back colors on Travis, which was disabled since rust-lang#39036.
  Append --color=always to cargo when running in CI environment.
* Removed `set -x` in the shell scripts. The `retry` function already
  prints which command it is running, add `-x` just add noise to the
  output.
* Support travis_fold/travis_time. Matching pairs of these allow Travis CI
  to collapse the output in between. This greatly cut down the unnecessary
  "successful" output one need to scroll through before finding the failed
  statement.
kennytm added a commit to kennytm/rust that referenced this pull request Jun 1, 2017
* Bring back colors on Travis, which was disabled since rust-lang#39036.
  Append --color=always to cargo when running in CI environment.
* Removed `set -x` in the shell scripts. The `retry` function already
  prints which command it is running, add `-x` just add noise to the
  output.
* Support travis_fold/travis_time. Matching pairs of these allow Travis CI
  to collapse the output in between. This greatly cut down the unnecessary
  "successful" output one need to scroll through before finding the failed
  statement.
bors added a commit that referenced this pull request Jun 2, 2017
Improve Travis CI log (travis_fold, colors)

Result looks like (https://travis-ci.org/rust-lang/rust/jobs/234614611):

<details><summary>Full page screenshot</summary>

![1-fullpage](https://cloud.githubusercontent.com/assets/103023/26302841/2627c354-3f18-11e7-9299-52a2088639af.jpg)

</details>

---

* Bring back colors on Travis, which was disabled since #39036. Append `--color=always` to cargo when running in CI environment.
* Removed `set -x` from the shell scripts. The `retry` function already prints which command it is running, adding `-x` just adds noise to the output. Interesting information can be manually `echo`ed.
* Support `travis_fold`/`travis_time`. Matching pairs of these allow Travis CI to collapse the output in between. This greatly cut down the unnecessary "successful" output one need to scroll through before finding the failed statement.
* Passed `--quiet` to all tests, so tests not failing will not occupy a line of log, reducing bloat in the report.

Also include some minor changes, like changing the `script` of `.travis.yml` to execute a single-line command, so the log won't write the extremely long multi-line
`The command "if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then … " exited with 0` at the end.
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.

4 participants