Skip to content

appveyor: Fix a switched condition for cargotest #48832

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Mar 8, 2018

Conversation

alexcrichton
Copy link
Member

It was intended that EXCLUDE_CARGO doesn't run cargotest!

It was intended that EXCLUDE_CARGO *doesn't* run cargotest!
@alexcrichton
Copy link
Member Author

@bors: r+ p=50

@bors
Copy link
Collaborator

bors commented Mar 8, 2018

📌 Commit 893e499 has been approved by alexcrichton

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 8, 2018
@bors
Copy link
Collaborator

bors commented Mar 8, 2018

⌛ Testing commit 893e499 with merge cdcca78...

bors added a commit that referenced this pull request Mar 8, 2018
appveyor: Fix a switched condition for cargotest

It was intended that EXCLUDE_CARGO *doesn't* run cargotest!
@bors
Copy link
Collaborator

bors commented Mar 8, 2018

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

@bors bors merged commit 893e499 into rust-lang:master Mar 8, 2018
@kennytm
Copy link
Member

kennytm commented Mar 8, 2018

Follow up on #48809 (comment).

The timings in this build are:

Job Duration
check x86_64-pc-windows-msvc 2h 16m
check i686-pc-windows-msvc (1) 2h 29m
check i686-pc-windows-msvc (2) 1h 41m
check-aux EXCLUDE_CARGO 1h 33m
cargotest 2h 02m
tools 1h 29m
check i686-pc-windows-gnu (1) 2h 10m
check i686-pc-windows-gnu (2) 1h 39m
check x86_64-pc-windows-gnu 2h 17m
dist x86_64-pc-windows-msvc 1h 50m
dist i686-pc-windows-msvc 2h 01m
dist i686-pc-windows-gnu 2h 03m
dist x86_64-pc-windows-gnu 1h 56m
dist-alt 1h 53m

To further balance the time taken we could

  • Exclude 24 minutes of tests in i686-pc-windows-msvc, move to the new job
  • Exclude 15 minutes of tests in i686-pc-windows-gnu, move to the new job
  • Exclude 22 minutes of tests in x86_64-pc-windows-msvc, move to check-aux
  • Note sure what to do with x86_64-pc-windows-gnu.

Some other reshuffling options regarding the 64-bit jobs:

  1.  

    • Combine check-aux and tools into a single job (note: affects Linux as well)
    • Move 8 minutes from x86_64-pc-windows-msvc to cargotest
    • Split x86_64-pc-windows-gnu
  2.  

    • Move the src/tools/cargo test of cargotest into tools
    • Move the cargotest test of cargotest into check-aux (note: these two affect Linux as well)
    • Split either x86_64-pc-windows-msvc or x86_64-pc-windows-gnu

(We may need more accurate metrics for this bin packing problem 😄)

@alexcrichton alexcrichton deleted the fix-skip-cargo branch March 8, 2018 15:25
@alexcrichton
Copy link
Member Author

Nice analysis @kennytm! I've opened up #48844 to track the rebalancing act here

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants