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

[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

Commits on Jul 21, 2020

  1. [beta] Update cargo

    ehuss committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    6a070f2 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2020

  1. Rollup merge of rust-lang#74406 - Mark-Simulacrum:fix-windows-maybe, …

    …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 authored and ehuss committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    59e3a05 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#74418 - rye:gha-dedup-shell-setting, r=piet…

    …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
    Manishearth authored and ehuss committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    85f1370 View commit details
    Browse the repository at this point in the history