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

[beta] Update cargo #74593

Merged
merged 3 commits into from
Jul 23, 2020
Merged

[beta] Update cargo #74593

merged 3 commits into from
Jul 23, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jul 21, 2020

2 commits in 4f74d9b2a771c58b7ef4906b2668afd075bc8081..149022b1d8f382e69c1616f6a46b69ebf59e2dea
2020-07-08 17:13:00 +0000 to 2020-07-17 16:39:39 -0400

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 21, 2020
@ehuss ehuss added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 21, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jul 21, 2020

📌 Commit 6a070f2 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 Jul 21, 2020
@bors
Copy link
Contributor

bors commented Jul 22, 2020

⌛ Testing commit 6a070f2 with merge e3b72866246b12baf14ed74522d83a0f432e84bf...

@bors
Copy link
Contributor

bors commented Jul 22, 2020

💔 Test failed - checks-actions

@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 Jul 22, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Jul 22, 2020

@Mark-Simulacrum It looks like maybe #74406 needs to be backported to the beta branch. Should I just include that in this PR, or do you want to do it? Or a separate PR and then roll them up together? Let me know if I can help.

@Mark-Simulacrum
Copy link
Member

Yeah, if you can include that here that'd be great. Alternatively you can just leave this and I can get to it in a few days, I usually do beta backports on Fridays/the weekend.

@Manishearth @ehuss
Rollup merge of rust-lang#74406 - Mark-Simulacrum:fix-windows-maybe, …
59e3a05 
…r=Mark-Simulacrum

Set shell for github actions CI

r? @pietroalbini but because this seems at worst harmless and CI is broken self approving
@Manishearth @ehuss
Rollup merge of rust-lang#74418 - rye:gha-dedup-shell-setting, r=piet…
85f1370 
…roalbini

ci: Set `shell: bash` as a default, remove duplicates

A follow-up to rust-lang#74406, this commit merely removes the `shell: bash` lines where they were added in favor of setting defaults for *all* "run" steps in the jobs that run the tests.

The changes in rust-lang#74406 were needed because of an upstream change to the `windows-2019` GitHub Actions image. Previously, the configuration worked fine without specifying `shell: bash`, but for some reason this broke with a new change that was deployed today. The preceding PR was a hotfix to get CI passing, but there was a slightly less duplicative way to specify the default shell for the jobs, which was to set the `defaults.run` option.

This change applies to the `pr`, `try`, `auto`, and `auto-fallible` jobs, which are derived from the YAML-anchor `base-ci-job`.  I did not apply these changes to the `master`, `try-success`, `try-failure`, `auto-success`, or `auto-failure` jobs because they have only a few steps.

cc/r? @Mark-Simulacrum
@ehuss
Copy link
Contributor Author

ehuss commented Jul 22, 2020

OK, I have included #74406 and #74418 to fix CI.

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jul 22, 2020

📌 Commit 85f1370 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 Jul 22, 2020
@bors
Copy link
Contributor

bors commented Jul 23, 2020

⌛ Testing commit 85f1370 with merge 025abffd6511a68fd5c3dad0837dd2cb4abb554b...

@Manishearth
Copy link
Member

Manishearth commented Jul 23, 2020 •
edited
Loading

@bors retry yield

(p>5 if you want this landed with priority over the rollup)

@rust-log-analyzer
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
##[group]Run exit 1
exit 1
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
##[endgroup]
##[error]Process completed with exit code 1.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@Manishearth
Copy link
Member

@bors treeclosed-

@bors
Copy link
Contributor

bors commented Jul 23, 2020

⌛ Testing commit 85f1370 with merge 6f95990...

@bors
Copy link
Contributor

bors commented Jul 23, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 6f95990 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 23, 2020
@bors bors merged commit 6f95990 into rust-lang:beta Jul 23, 2020
@ehuss ehuss mentioned this pull request Jul 23, 2020
Merged
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.46
Development

Successfully merging this pull request may close these issues.
7 participants
@ehuss @rust-highfive @Mark-Simulacrum @bors @Manishearth @rust-log-analyzer @cuviper