Skip to content

Commit accbb87

Browse files
ci: update allowed integration failure list for rustfmt 2.0
1 parent 788eb5a commit accbb87

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.github/workflows/integration.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ jobs:
1515
matrix:
1616
integration: [
1717
bitflags,
18-
chalk,
19-
crater,
2018
error-chain,
21-
glob,
2219
log,
2320
mdbook,
2421
packed_simd,
@@ -37,6 +34,15 @@ jobs:
3734
# Instead, leverage `continue-on-error`
3835
# https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepscontinue-on-error
3936
#
37+
# Failing due to breaking changes in rustfmt 2.0 where empty
38+
# match blocks have trailing commas removed
39+
# https://github.com/rust-lang/rustfmt/pull/4226
40+
- integration: chalk
41+
allow-failure: true
42+
- integration: crater
43+
allow-failure: true
44+
- integration: glob
45+
allow-failure: true
4046
# Using old rustfmt configuration option
4147
- integration: rand
4248
allow-failure: true

.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ matrix:
1818
- env: CFG_RELEASE_CHANNEL=beta
1919
- os: osx
2020
- env: INTEGRATION=bitflags
21-
- env: INTEGRATION=chalk
22-
- env: INTEGRATION=crater
2321
- env: INTEGRATION=error-chain
24-
- env: INTEGRATION=glob
2522
- env: INTEGRATION=log
2623
- env: INTEGRATION=mdbook
2724
- env: INTEGRATION=packed_simd
@@ -30,6 +27,12 @@ matrix:
3027
- env: INTEGRATION=tempdir
3128
- env: INTEGRATION=futures-rs
3229
allow_failures:
30+
# Failing due to breaking changes in rustfmt 2.0 where empty
31+
# match blocks have trailing commas removed
32+
# https://github.com/rust-lang/rustfmt/pull/4226
33+
- env: INTEGRATION=chalk
34+
- env: INTEGRATION=crater
35+
- env: INTEGRATION=glob
3336
# Using old configuration option
3437
- env: INTEGRATION=rand
3538
# Doesn't build - keep this in allow_failures as it's fragile to breaking changes of rustc.

0 commit comments

Comments
 (0)