Skip to content

Commit d1096fd

Browse files
authored
Rollup merge of rust-lang#91483 - calebcartwright:sync-rustfmt-subtree, r=calebcartwright
Sync rustfmt subtree
2 parents d1ce18c + f6ade7c commit d1096fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1730
-435
lines changed

src/tools/rustfmt/.github/workflows/linux.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ on:
88
jobs:
99
test:
1010
runs-on: ubuntu-latest
11-
name: (${{ matrix.target }}, nightly)
11+
name: (${{ matrix.target }}, ${{ matrix.cfg_release_channel }})
12+
env:
13+
CFG_RELEASE_CHANNEL: ${{ matrix.cfg_release_channel }}
1214
strategy:
1315
# https://help.github.com/en/actions/getting-started-with-github-actions/about-github-actions#usage-limits
1416
# There's a limit of 60 concurrent jobs across all repos in the rust-lang organization.
@@ -20,6 +22,7 @@ jobs:
2022
target: [
2123
x86_64-unknown-linux-gnu,
2224
]
25+
cfg_release_channel: [nightly, stable]
2326

2427
steps:
2528
- name: checkout

src/tools/rustfmt/.github/workflows/mac.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@ jobs:
1010
# https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners#supported-runners-and-hardware-resources
1111
# macOS Catalina 10.15
1212
runs-on: macos-latest
13-
name: (${{ matrix.target }}, nightly)
13+
name: (${{ matrix.target }}, ${{ matrix.cfg_release_channel }})
14+
env:
15+
CFG_RELEASE_CHANNEL: ${{ matrix.cfg_release_channel }}
1416
strategy:
1517
fail-fast: false
1618
matrix:
1719
target: [
1820
x86_64-apple-darwin,
1921
]
22+
cfg_release_channel: [nightly, stable]
2023

2124
steps:
2225
- name: checkout

src/tools/rustfmt/.github/workflows/windows.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ on:
88
jobs:
99
test:
1010
runs-on: windows-latest
11-
name: (${{ matrix.target }}, nightly)
11+
name: (${{ matrix.target }}, ${{ matrix.cfg_release_channel }})
12+
env:
13+
CFG_RELEASE_CHANNEL: ${{ matrix.cfg_release_channel }}
1214
strategy:
1315
# https://help.github.com/en/actions/getting-started-with-github-actions/about-github-actions#usage-limits
1416
# There's a limit of 60 concurrent jobs across all repos in the rust-lang organization.
@@ -23,6 +25,7 @@ jobs:
2325
x86_64-pc-windows-gnu,
2426
x86_64-pc-windows-msvc,
2527
]
28+
cfg_release_channel: [nightly, stable]
2629

2730
steps:
2831
# The Windows runners have autocrlf enabled by default

0 commit comments

Comments
 (0)