Skip to content

Commit 2cd75e1

Browse files
ci: Fix nightly issues (#3241)
1 parent cdcd3be commit 2cd75e1

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

.github/workflows/ci_nightly.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ env:
1313

1414
jobs:
1515
esp-hal-nightly:
16-
name: esp-hal | nightly (${{ matrix.device.soc }})
16+
name: esp-hal | nightly (${{ matrix.device }})
1717
runs-on: ubuntu-latest
1818
env:
19+
CI: 1
1920
SSID: SSID
2021
PASSWORD: PASSWORD
2122
STATIC_IP: 1.1.1.1
@@ -25,13 +26,7 @@ jobs:
2526
strategy:
2627
fail-fast: false
2728
matrix:
28-
device: [
29-
# RISC-V devices:
30-
{ soc: "esp32c2", target: "riscv32imc-unknown-none-elf" },
31-
{ soc: "esp32c3", target: "riscv32imc-unknown-none-elf" },
32-
{ soc: "esp32c6", target: "riscv32imac-unknown-none-elf" },
33-
{ soc: "esp32h2", target: "riscv32imac-unknown-none-elf" },
34-
]
29+
device: [ "esp32c2", "esp32c3", "esp32c6", "esp32h2" ]
3530
steps:
3631
- uses: actions/checkout@v4
3732

@@ -46,7 +41,7 @@ jobs:
4641

4742
- name: Build and Check
4843
shell: bash
49-
run: cargo +nightly xtask ci ${{ matrix.device.soc }}
44+
run: cargo +nightly xtask ci ${{ matrix.device }}
5045

5146
- if: failure()
5247
name: Create or Update GitHub Issue

xtask/src/lib.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,6 @@ pub fn execute_app(
163163
if target.starts_with("xtensa") {
164164
builder = builder.toolchain("esp");
165165
builder.add_arg("-Zbuild-std=core,alloc");
166-
} else {
167-
// NOTE: This shouldn't be required, something fishy is going on...
168-
builder = builder.toolchain("stable")
169166
}
170167

171168
if subcommand == "test" && chip == Chip::Esp32c2 {
@@ -229,9 +226,6 @@ pub fn build_package(
229226

230227
if let Some(toolchain) = toolchain {
231228
builder = builder.toolchain(toolchain);
232-
} else {
233-
// NOTE: This shouldn't be required, something fishy is going on...
234-
builder = builder.toolchain("stable");
235229
}
236230

237231
if let Some(target) = target {

0 commit comments

Comments
 (0)