Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to '.github/workflows/ci.yaml')
-rw-r--r--.github/workflows/ci.yaml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 770652494f..e3384c976b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -56,8 +56,8 @@ jobs:
# Install a pinned rustc commit to avoid surprises
- name: Install Rust toolchain
run: |
- RUSTC_VERSION=`cat rust-version`
- rustup-toolchain-install-master ${RUSTC_VERSION} -c rust-src -c rustfmt
+ RUSTC_VERSION=$(cat rust-version)
+ rustup-toolchain-install-master ${RUSTC_VERSION} -c cargo -c rust-src -c rustfmt
rustup default ${RUSTC_VERSION}
# Emulate a nightly toolchain, because the toolchain installed above does not have "nightly"
@@ -98,9 +98,9 @@ jobs:
run: |
rustup update --no-self-update stable
rustup default stable
- rustup component add --toolchain stable rust-src clippy
- # We always use a nightly rustfmt, regardless of channel, because we need
- # --file-lines.
+ rustup component add --toolchain stable rust-src clippy rustfmt
+ # We also install a nightly rustfmt, because we use `--file-lines` in
+ # a test.
rustup toolchain install nightly --profile minimal --component rustfmt
# https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/rust.json
- name: Install Rust Problem Matcher
@@ -293,7 +293,7 @@ jobs:
timeout-minutes: 10
env:
FORCE_COLOR: 1
- TYPOS_VERSION: v1.28.3
+ TYPOS_VERSION: v1.38.1
steps:
- name: download typos
run: curl -LsSf https://github.com/crate-ci/typos/releases/download/$TYPOS_VERSION/typos-$TYPOS_VERSION-x86_64-unknown-linux-musl.tar.gz | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin