Skip to content

Commit 9017de4

Browse files
committed
ci: fix post-merge tool installs
1 parent 3eba5b1 commit 9017de4

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

.github/workflows/ci-post-merge.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,13 @@ jobs:
101101
uses: actions-rust-lang/setup-rust-toolchain@v1
102102
with: { toolchain: nightly }
103103

104+
- name: Install cargo-tarpaulin
105+
uses: taiki-e/install-action@v1
106+
with: { tool: cargo-tarpaulin }
107+
104108
- name: Generate coverage file
105109
if: github.ref == 'refs/heads/master'
106-
run: |
107-
cargo install cargo-tarpaulin
108-
cargo tarpaulin --out Xml --verbose
110+
run: cargo tarpaulin --out Xml --verbose
109111
- name: Upload to Codecov
110112
if: github.ref == 'refs/heads/master'
111113
uses: codecov/codecov-action@v3
@@ -121,8 +123,9 @@ jobs:
121123
uses: actions-rust-lang/setup-rust-toolchain@v1
122124
with: { toolchain: nightly }
123125

124-
- uses: taiki-e/install-action@v1
125-
with: { tool: cargo-hack, cargo-minimal-versions }
126+
- name: Install cargo-hack & cargo-minimal-versions
127+
uses: taiki-e/install-action@v1
128+
with: { tool: 'cargo-hack,cargo-minimal-versions' }
126129

127130
- name: Check With Minimal Versions
128131
run: cargo minimal-versions check
@@ -137,7 +140,8 @@ jobs:
137140
uses: actions-rust-lang/setup-rust-toolchain@v1
138141

139142
- name: Install cargo-nextest
140-
run: cargo install cargo-nextest
143+
uses: taiki-e/install-action@v1
144+
with: { tool: cargo-nextest }
141145

142146
- name: Test with cargo-nextest
143147
run: cargo nextest run

actix-macros/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ type AttributeArgs = syn::punctuated::Punctuated<syn::Meta, syn::Token![,]>;
2828
/// println!("Hello world");
2929
/// }
3030
/// ```
31-
// #[allow(clippy::needless_doctest_main)]
32-
// #[cfg(not(test))] // Work around for rust-lang/rust#62127
31+
#[allow(clippy::needless_doctest_main)]
32+
#[cfg(not(test))] // Work around for rust-lang/rust#62127
3333
#[proc_macro_attribute]
3434
pub fn main(args: TokenStream, item: TokenStream) -> TokenStream {
3535
let mut input = match syn::parse::<syn::ItemFn>(item.clone()) {

0 commit comments

Comments
 (0)