build: improve script and travis config #4675

tesuji · 2019-10-16T06:52:20Z

fix a diff failure on windows

See https://travis-ci.com/rust-lang/rust-clippy/jobs/245971932#L1625
for an example.

use cmp instead of diff > /dev/null
clone single branch instead of clone then checking out
do not decrypt key if have no diff change

changelog: none

flip1995

I'm really no bash expert, so some questions might seem silly. Most of the changes LGTM.

.github/deploy.sh

ci/base-tests.sh

tests/ui-toml/update-all-references.sh

flip1995 · 2019-10-16T07:55:11Z

Oh and thanks for all the work on the build system lately! ❤️

.github/deploy.sh

tesuji · 2019-10-16T09:45:02Z

ci/base-tests.sh


  # Make sure this isn't set - clippy-driver should cope without it
  unset CARGO_MANIFEST_DIR

  # Run a lint and make sure it produces the expected output. It's also expected to exit with code 1
-  # XXX How to match the clippy invocation in compile-test.rs?
-  ! ./target/debug/clippy-driver -Dwarnings -Aunused -Zui-testing --emit metadata --crate-type bin tests/ui/cstring.rs 2> cstring.stderr


I don't understand what this command does. Could someone explain it to me?

This whole block checks if clippy-driver can be run without cargo.

This command is just a test, if the output of clippy-driver is the same as the output of the ui-test. Why cstring.rs was chosen for this test, I have no idea.

I guess all these flags are there to simulate the behavior of compiletest-rs.

The PR that added this has some more context. Maybe include the PR link in the comment?
#3665

ci/integration-tests.sh

tests/ui/update-references.sh

tesuji · 2019-10-17T10:15:02Z

Ready for review!
I sorted out the test failure in cargo-clippy on macOS systems.

bors · 2019-10-17T18:07:51Z

☔ The latest upstream changes (presumably #4659) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2019-10-20T11:36:48Z

☔ The latest upstream changes (presumably #4702) made this pull request unmergeable. Please resolve the merge conflicts.

flip1995 · 2019-10-21T07:30:14Z

.travis.yml

+      osx )
+        # See <https://github.com/nteract/nteract/issues/1523#issuecomment-301623519>
+        sudo mkdir -p /usr/local/lib
+        sudo find "$SYSROOT/lib" -maxdepth 1 -name '*.dylib' -exec ln -s {} /usr/local/lib \;
+        ;;


This wasn't necessary before. What changed?

Honestly, I don't know. I tried to set LD_LIBRARY_PATH, LIBRARY_PATH, DYLD_LIBRARY_PATH. All of that still made this PR failed.

ci/base-tests.sh

* fix a diff failure on windows See https://travis-ci.com/rust-lang/rust-clippy/jobs/245971932#L1625 for an example. * use cmp instead of diff > /dev/null * clone single branch instead of clone then checking out * do not decrypt key if have no diff change

tesuji · 2019-10-22T03:34:53Z

Build succeed. I wanna more eyes and thoughts on #4675 (comment).

Now the travis CI build time is fast enough to not cause build timeout.

phansch · 2019-10-23T19:19:58Z

@bors try

build: improve script and travis config * fix a diff failure on windows See https://travis-ci.com/rust-lang/rust-clippy/jobs/245971932#L1625 for an example. * use cmp instead of diff > /dev/null * clone single branch instead of clone then checking out * do not decrypt key if have no diff change changelog: none

bors · 2019-10-23T19:20:06Z

⌛ Trying commit 088d528 with merge 23a5fce...

tesuji · 2019-10-23T19:25:05Z

Note that in the first try, the cache will be invalidated because of removing BASE_TESTS env.

bors · 2019-10-23T20:05:38Z

☀️ Try build successful - checks-travis, status-appveyor
Build commit: 23a5fce (23a5fce1a82eed9ea57887021901b0c5ad5eb89b)

phansch · 2019-10-23T20:08:53Z

@bors try

bors · 2019-10-23T20:09:00Z

⌛ Trying commit 088d528 with merge 5db053f...

build: improve script and travis config * fix a diff failure on windows See https://travis-ci.com/rust-lang/rust-clippy/jobs/245971932#L1625 for an example. * use cmp instead of diff > /dev/null * clone single branch instead of clone then checking out * do not decrypt key if have no diff change changelog: none

bors · 2019-10-23T20:33:07Z

☀️ Try build successful - checks-travis, status-appveyor
Build commit: 5db053f (5db053f5de87553cd5a80a705ceaea2b2cd125b4)

phansch · 2019-10-24T05:20:41Z

Changes look good to me. I can't say anything about the dylib stuff, but it seems to work fine 🤷‍♂️

Thanks for all your build improvements!

@bors r+

bors · 2019-10-24T05:20:42Z

📌 Commit 088d528 has been approved by phansch

bors · 2019-10-24T05:20:49Z

⌛ Testing commit 088d528 with merge 87536f0...

build: improve script and travis config * fix a diff failure on windows See https://travis-ci.com/rust-lang/rust-clippy/jobs/245971932#L1625 for an example. * use cmp instead of diff > /dev/null * clone single branch instead of clone then checking out * do not decrypt key if have no diff change changelog: none

bors · 2019-10-24T05:53:58Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: phansch
Pushing 87536f0 to master...

flip1995 reviewed Oct 16, 2019

View reviewed changes

.github/deploy.sh Show resolved Hide resolved

.github/deploy.sh Show resolved Hide resolved

ci/base-tests.sh Outdated Show resolved Hide resolved

tests/ui-toml/update-all-references.sh Show resolved Hide resolved

tesuji force-pushed the improve-shellscript branch from aa256c2 to 1ce44aa Compare October 16, 2019 09:38

flip1995 reviewed Oct 16, 2019

View reviewed changes

.github/deploy.sh Show resolved Hide resolved

tesuji commented Oct 16, 2019

View reviewed changes

tesuji force-pushed the improve-shellscript branch from 1ce44aa to 6b3ba64 Compare October 16, 2019 09:46

phansch reviewed Oct 17, 2019

View reviewed changes

tests/ui/update-references.sh Show resolved Hide resolved

phansch added the S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) label Oct 17, 2019

tesuji force-pushed the improve-shellscript branch 4 times, most recently from 27e88b6 to 16c2681 Compare October 17, 2019 10:11

tesuji requested review from phansch and flip1995 October 17, 2019 10:13

tesuji force-pushed the improve-shellscript branch 3 times, most recently from d4f2bba to 33cf02c Compare October 18, 2019 04:09

phansch added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties and removed S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) labels Oct 18, 2019

tesuji force-pushed the improve-shellscript branch from 33cf02c to e6cb66a Compare October 19, 2019 12:46

tesuji changed the title ~~build: improve script and travis config~~ [WIP] build: improve script and travis config Oct 19, 2019

flip1995 reviewed Oct 21, 2019

View reviewed changes

tesuji force-pushed the improve-shellscript branch 4 times, most recently from f2ffc3d to 44c3c9c Compare October 21, 2019 08:09

tesuji changed the title ~~[WIP] build: improve script and travis config~~ build: improve script and travis config Oct 22, 2019

This was referenced Oct 22, 2019

[WIP] Remove travis_wait #4711

Closed

[WIP] Test if clippy got much slower over the last few days #4712

Closed

tesuji force-pushed the improve-shellscript branch from 8fdbbcd to 312c761 Compare October 22, 2019 05:36

tesuji added 5 commits October 22, 2019 16:16

build: use shared target dir

f3ace5e

nit: ! is not on a condition and skips errexit

049800d

build: remove travis_wait

ba673d0

Now the travis CI build time is fast enough to not cause build timeout.

Early exit if errors in integration tests

629b4d5

build: remove needless BASE_TESTS env

088d528

tesuji force-pushed the improve-shellscript branch from 312c761 to 088d528 Compare October 23, 2019 17:54

phansch approved these changes Oct 24, 2019

View reviewed changes

bors merged commit 088d528 into rust-lang:master Oct 24, 2019

This was referenced Oct 24, 2019

generate stderr file on 32bit pointer system #4690

Merged

Do not early exit if cargo clippy returns non-zero status code #4720

Merged

tesuji deleted the improve-shellscript branch October 24, 2019 08:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build: improve script and travis config #4675

build: improve script and travis config #4675

tesuji commented Oct 16, 2019

flip1995 left a comment

flip1995 commented Oct 16, 2019

tesuji Oct 16, 2019

flip1995 Oct 16, 2019

phansch Oct 17, 2019 •

edited

Loading

tesuji commented Oct 17, 2019 •

edited

Loading

bors commented Oct 17, 2019

bors commented Oct 20, 2019

flip1995 Oct 21, 2019

tesuji Oct 21, 2019 •

edited

Loading

tesuji commented Oct 22, 2019

phansch commented Oct 23, 2019

bors commented Oct 23, 2019

tesuji commented Oct 23, 2019

bors commented Oct 23, 2019

phansch commented Oct 23, 2019

bors commented Oct 23, 2019

bors commented Oct 23, 2019

phansch commented Oct 24, 2019

bors commented Oct 24, 2019

bors commented Oct 24, 2019

bors commented Oct 24, 2019

build: improve script and travis config #4675

build: improve script and travis config #4675

Conversation

tesuji commented Oct 16, 2019

flip1995 left a comment

Choose a reason for hiding this comment

flip1995 commented Oct 16, 2019

tesuji Oct 16, 2019

Choose a reason for hiding this comment

flip1995 Oct 16, 2019

Choose a reason for hiding this comment

phansch Oct 17, 2019 • edited Loading

Choose a reason for hiding this comment

tesuji commented Oct 17, 2019 • edited Loading

bors commented Oct 17, 2019

bors commented Oct 20, 2019

flip1995 Oct 21, 2019

Choose a reason for hiding this comment

tesuji Oct 21, 2019 • edited Loading

Choose a reason for hiding this comment

tesuji commented Oct 22, 2019

phansch commented Oct 23, 2019

bors commented Oct 23, 2019

tesuji commented Oct 23, 2019

bors commented Oct 23, 2019

phansch commented Oct 23, 2019

bors commented Oct 23, 2019

bors commented Oct 23, 2019

phansch commented Oct 24, 2019

bors commented Oct 24, 2019

bors commented Oct 24, 2019

bors commented Oct 24, 2019

phansch Oct 17, 2019 •

edited

Loading

tesuji commented Oct 17, 2019 •

edited

Loading

tesuji Oct 21, 2019 •

edited

Loading