Skip to content

Commit 23ddce4

Browse files
committed
CI: Updated nightly version and locked cargo-expand install
The updated nightly version fixes a bug with the 'match_block_trailing_comma' rustfmt config. Previously not all missing commas were caught. Probably related to rust-lang/rustfmt#4998. When installing cargo-expand, we now use '--locked' to ensure lock-files are used. This is a workaround for the release of v4.7.0 of the 'syntect' crates, which violated semantic versioning. Using the lock files avoids this version. For details see sharkdp/bat#1991.
1 parent c891b33 commit 23ddce4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/actions/run-test-groups/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
# Install dependencies of 'macrotest'
2626
rustup toolchain install nightly
2727
# Can only use stable rust to build cargo-expand because it doesn't build on 1.34
28-
cargo +stable install cargo-expand
28+
cargo +stable install --locked cargo-expand
2929
# Set the rust version to use for this build
3030
rustup default ${{ inputs.rust-version }}
3131
- run: echo "::group::Test no_features"

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
name: Rustfmt
4949
runs-on: ubuntu-latest
5050
env:
51-
RUSTV: nightly-2021-06-08
51+
RUSTV: nightly-2021-12-26
5252
steps:
5353
- uses: actions/checkout@v2
5454
- name: Install

0 commit comments

Comments
 (0)