|
11 | 11 |
|
12 | 12 | env: |
13 | 13 | CARGO_TERM_COLOR: always |
| 14 | + MSRV: "1.82" |
14 | 15 |
|
15 | 16 | # Cancel any currently running workflows from the same PR, branch, or |
16 | 17 | # tag when a new workflow is triggered. |
|
59 | 60 | arch: ${{ matrix.platform.arch }} |
60 | 61 | target: ${{ matrix.platform.target }} |
61 | 62 |
|
62 | | - - run: cargo check |
63 | | - |
64 | | - - run: cargo run --package=cargo-espflash -- espflash completions bash |
65 | | - - run: cargo run --package=espflash -- completions bash |
| 63 | + - run: cargo run -p cargo-espflash -- espflash completions bash |
| 64 | + - run: cargo run -p espflash -- completions bash |
66 | 65 |
|
67 | 66 | check-lib: |
68 | 67 | name: Check lib (${{ matrix.platform.target }}) |
@@ -112,64 +111,38 @@ jobs: |
112 | 111 | with: |
113 | 112 | arch: ${{ matrix.platform.arch }} |
114 | 113 | target: ${{ matrix.platform.target }} |
115 | | - toolchain: "1.82" |
| 114 | + toolchain: ${{ env.MSRV }} |
116 | 115 |
|
117 | 116 | - run: cargo check -p espflash --lib |
118 | 117 |
|
119 | 118 | # -------------------------------------------------------------------------- |
120 | 119 | # Test |
121 | 120 |
|
122 | 121 | test: |
123 | | - name: Unit Tests (${{ matrix.platform.target }}) |
124 | | - strategy: |
125 | | - fail-fast: false |
126 | | - matrix: |
127 | | - platform: |
128 | | - - target: "x86_64-unknown-linux-gnu" |
129 | | - arch: "x86_64" |
130 | | - - target: "aarch64-unknown-linux-gnu" |
131 | | - arch: "arm64" |
132 | | - - target: "armv7-unknown-linux-gnueabihf" |
133 | | - arch: "armhf" |
| 122 | + name: Unit Tests |
134 | 123 | runs-on: ubuntu-22.04 |
135 | 124 |
|
136 | 125 | steps: |
137 | 126 | - uses: actions/checkout@v4 |
138 | | - |
139 | 127 | - uses: ./.github/actions/setup-target |
140 | | - with: |
141 | | - arch: ${{ matrix.platform.arch }} |
142 | | - target: ${{ matrix.platform.target }} |
143 | 128 |
|
144 | 129 | - run: cargo test --lib |
145 | 130 |
|
146 | 131 | # -------------------------------------------------------------------------- |
147 | 132 | # Lint |
148 | 133 |
|
149 | 134 | clippy: |
150 | | - name: Clippy (${{ matrix.platform.target }}) |
151 | | - strategy: |
152 | | - fail-fast: false |
153 | | - matrix: |
154 | | - platform: |
155 | | - - target: "x86_64-unknown-linux-gnu" |
156 | | - arch: "x86_64" |
157 | | - - target: "aarch64-unknown-linux-gnu" |
158 | | - arch: "arm64" |
159 | | - - target: "armv7-unknown-linux-gnueabihf" |
160 | | - arch: "armhf" |
| 135 | + name: Clippy |
161 | 136 | runs-on: ubuntu-22.04 |
162 | 137 |
|
163 | 138 | steps: |
164 | 139 | - uses: actions/checkout@v4 |
165 | | - |
166 | | - - uses: ./.github/actions/setup-target |
| 140 | + - uses: dtolnay/rust-toolchain@stable |
167 | 141 | with: |
168 | | - arch: ${{ matrix.platform.arch }} |
169 | | - target: ${{ matrix.platform.target }} |
170 | 142 | components: clippy |
| 143 | + - uses: Swatinem/rust-cache@v2 |
171 | 144 |
|
172 | | - - run: cargo clippy -- -D warnings -A clippy::too_many_arguments |
| 145 | + - run: cargo clippy -- -D warnings |
173 | 146 |
|
174 | 147 | rustfmt: |
175 | 148 | name: Rustfmt |
|
0 commit comments