Skip to content

Conversation

Mark-Simulacrum
Copy link
Member

r? @pietroalbini but because this seems at worst harmless and CI is broken self approving

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 16, 2020
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Jul 16, 2020

📌 Commit fe95f0ee97c05b1283f6cdd912cb4f3516df9efd has been approved by Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Jul 16, 2020

🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened

@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 16, 2020
@bors
Copy link
Collaborator

bors commented Jul 16, 2020

⌛ Testing commit fe95f0ee97c05b1283f6cdd912cb4f3516df9efd with merge fff7504ab0a9536ed0bb475a6937c5efda8e1103...

@Mark-Simulacrum
Copy link
Member Author

@bors r-

Hm okay so need to do it manually seems like

The workflow is not valid. .github/workflows/ci.yml (Line: 67, Col: 9): Unexpected value 'shell',.github/workflows/ci.yml (Line: 187, Col: 9): Unexpected value 'shell'

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 16, 2020
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=10

Seems to at least validate as a valid config now

@bors
Copy link
Collaborator

bors commented Jul 16, 2020

📌 Commit 5b287f6 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 16, 2020
@bors
Copy link
Collaborator

bors commented Jul 16, 2020

⌛ Testing commit 5b287f6 with merge f6b3fa041883c254704f35d850c93dd8aa1c72d4...

Copy link
Contributor

@rye rye left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One note: you can use defaults.run to specify the default for all run steps in a job instead of specifying manually for each run step, like:

defaults:
  run:
    shell: bash

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 16, 2020
…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
Copy link
Member

@bors p=4 retry yield

Including in rollup

@Manishearth Manishearth mentioned this pull request Jul 16, 2020
2 tasks
@Mark-Simulacrum
Copy link
Member Author

One note: you can use defaults.run to specify the default for all run steps in a job instead of specifying manually for each run step, like:

defaults:
  run:
    shell: bash

This sounds great -- but let's get CI unblocked first. I personally am a bit scared of changing defaults in a self-approved PR like this as well

@rye
Copy link
Contributor

rye commented Jul 16, 2020

This sounds great -- but let's get CI unblocked first.

No problem, I can submit a follow-up PR once the queue cools off a bit.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2020
…arth

Rollup of 21 pull requests

Successful merges:

 - rust-lang#73566 (Don't run `everybody_loops` for rustdoc; instead ignore resolution errors)
 - rust-lang#73771 (Don't pollute docs/suggestions with libstd deps)
 - rust-lang#73794 (Small cleanup for E0705 explanation)
 - rust-lang#73807 (rustdoc: glue tokens before highlighting)
 - rust-lang#73835 (Clean up E0710 explanation)
 - rust-lang#73926 (Ignoring test case: [codegen] repr-transparent-aggregates-1.rs for aarch64)
 - rust-lang#73981 (Remove some `ignore-stage1` annotations.)
 - rust-lang#73998 (add regression test for rust-lang#61216)
 - rust-lang#74140 (Make hir ProjectionKind more precise)
 - rust-lang#74148 (Move #[doc(alias)] check in rustc)
 - rust-lang#74159 (forbid generic params in the type of const params)
 - rust-lang#74171 (Fix 44056 test with debug on macos.)
 - rust-lang#74221 (Don't panic if the lhs of a div by zero is not statically known)
 - rust-lang#74325 (Focus on the current file in the source file sidebar)
 - rust-lang#74359 (rustdoc: Rename internal API fns to `into_string`)
 - rust-lang#74370 (Reintroduce spotlight / "important traits" feature)
 - rust-lang#74390 (Fix typo in std::mem::transmute documentation)
 - rust-lang#74391 (BtreeMap: superficially refactor root access)
 - rust-lang#74392 (const generics triage)
 - rust-lang#74397 (Fix typo in the latest release note)
 - rust-lang#74406 (Set shell for github actions CI)

Failed merges:

r? @ghost
@bors bors merged commit ff685f5 into rust-lang:master Jul 16, 2020
rye added a commit to rye/rust that referenced this pull request Jul 16, 2020
A follow-up to rust-lang#74406, this commit merely removes the `shell: bash`
lines where they are explicitly added in favor of setting defaults for
*all* "run" steps.

Signed-off-by: Kristofer Rye <[email protected]>
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 18, 2020
…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 added a commit to Manishearth/rust that referenced this pull request Jul 18, 2020
…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 added a commit to Manishearth/rust that referenced this pull request Jul 18, 2020
…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 ehuss mentioned this pull request Jul 22, 2020
ehuss pushed a commit to ehuss/rust that referenced this pull request Jul 22, 2020
…r=Mark-Simulacrum

Set shell for github actions CI

r? @pietroalbini but because this seems at worst harmless and CI is broken self approving
ehuss pushed a commit to ehuss/rust that referenced this pull request Jul 22, 2020
…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 ehuss mentioned this pull request Jul 23, 2020
Mark-Simulacrum pushed a commit to Mark-Simulacrum/rust that referenced this pull request Jul 23, 2020
A follow-up to rust-lang#74406, this commit merely removes the `shell: bash`
lines where they are explicitly added in favor of setting defaults for
*all* "run" steps.

Signed-off-by: Kristofer Rye <[email protected]>
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

7 participants