Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various small CI updates #998

Merged
merged 5 commits into from
Dec 5, 2023
Merged

Various small CI updates #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ac894f
Update to latest version of `checkout` action
jessebraham Dec 4, 2023
3cc8838
Re-order jobs to match order on filesystem
jessebraham Dec 4, 2023
3029b98
Check all features of `esp-riscv-rt`
jessebraham Dec 5, 2023
9c2f263
Check both `esp32s2` and `esp32s3` feature for `esp-ulp-riscv-hal`
jessebraham Dec 5, 2023
643ce9f
Add a `ci` feature to `esp-riscv-rt` to making testing easier
jessebraham Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 54 additions & 48 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,57 @@ jobs:
- name: rustdoc
run: cd esp-hal-smartled/ && cargo doc -Zbuild-std=core --target=riscv32imc-unknown-none-elf --features=esp32c3

esp-riscv-rt:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@v1
with:
target: riscv32imc-unknown-none-elf,riscv32imac-unknown-none-elf
toolchain: nightly
components: rust-src
- uses: Swatinem/rust-cache@v2

- name: Build esp-riscv-rt (riscv32imc, no features)
run: cd esp-riscv-rt/ && cargo build -Zbuild-std=core --target=riscv32imc-unknown-none-elf
- name: Build esp-riscv-rt (riscv32imac, no features)
run: cd esp-riscv-rt/ && cargo build -Zbuild-std=core --target=riscv32imac-unknown-none-elf
- name: Build esp-riscv-rt (riscv32imc, all features)
run: cd esp-riscv-rt/ && cargo build -Zbuild-std=core --target=riscv32imc-unknown-none-elf --features=ci
- name: Build esp-riscv-rt (riscv32imac, all features)
run: cd esp-riscv-rt/ && cargo build -Zbuild-std=core --target=riscv32imac-unknown-none-elf --features=ci
# Ensure documentation can be built
- name: rustdoc
run: cd esp-riscv-rt/ && cargo doc

esp-ulp-riscv-hal:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@v1
with:
target: riscv32imc-unknown-none-elf
toolchain: nightly
components: rust-src
- uses: Swatinem/rust-cache@v2

# Perform a full build initially to verify that the examples not only
# build, but also link successfully.
- name: build esp-ulp-riscv-hal (esp32s2)
run: cd esp-ulp-riscv-hal/ && cargo build --release --features=esp32s2 --examples
- name: build esp-ulp-riscv-hal (esp32s3)
run: cd esp-ulp-riscv-hal/ && cargo build --release --features=esp32s3 --examples
# Ensure documentation can be built
- name: rustdoc
run: cd esp-ulp-riscv-hal/ && cargo doc --features=esp32s3

esp32-hal:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: esp-rs/[email protected]
with:
default: true
Expand Down Expand Up @@ -119,7 +165,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@v1
with:
target: riscv32imc-unknown-none-elf
Expand Down Expand Up @@ -171,7 +217,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@v1
with:
target: riscv32imc-unknown-none-elf
Expand Down Expand Up @@ -223,7 +269,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@v1
with:
target: riscv32imac-unknown-none-elf
Expand Down Expand Up @@ -280,7 +326,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@v1
with:
target: riscv32imac-unknown-none-elf
Expand All @@ -300,7 +346,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@v1
with:
target: riscv32imac-unknown-none-elf
Expand Down Expand Up @@ -348,31 +394,11 @@ jobs:
- name: rustdoc
run: cd esp32h2-hal/ && cargo doc --features=eh1

esp-ulp-riscv-hal:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@v1
with:
target: riscv32imc-unknown-none-elf
toolchain: nightly
components: rust-src
- uses: Swatinem/rust-cache@v2

# Perform a full build initially to verify that the examples not only
# build, but also link successfully.
- name: build esp-ulp-riscv-hal (esp32s3)
run: cd esp-ulp-riscv-hal/ && cargo +nightly build --release --features=esp32s3 --examples
# Ensure documentation can be built
- name: rustdoc
run: cd esp-ulp-riscv-hal/ && cargo doc --features=esp32s3

esp32s2-hal:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: esp-rs/[email protected]
with:
default: true
Expand Down Expand Up @@ -447,7 +473,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: esp-rs/[email protected]
with:
default: true
Expand Down Expand Up @@ -524,26 +550,6 @@ jobs:
- name: rustdoc
run: cd esp32s3-hal/ && cargo doc --features=eh1

esp-riscv-rt:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@v1
with:
target: riscv32imac-unknown-none-elf, riscv32imc-unknown-none-elf
toolchain: nightly
components: rust-src
- uses: Swatinem/rust-cache@v2

- name: Check esp-riscv-rt (imc)
run: cd esp-riscv-rt/ && cargo check --target=riscv32imc-unknown-none-elf -Zbuild-std=core
- name: Check esp-riscv-rt (imac)
run: cd esp-riscv-rt/ && cargo check --target=riscv32imac-unknown-none-elf -Zbuild-std=core
# Ensure documentation can be built
- name: rustdoc
run: cd esp-riscv-rt/ && cargo doc

# --------------------------------------------------------------------------
# MSRV

Expand Down
13 changes: 13 additions & 0 deletions esp-riscv-rt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,16 @@ init-data = []
init-rw-text = []
init-rtc-fast-data = []
init-rtc-fast-text = []

# This feature is intended for testing; you probably don't want to enable it:
ci = [
"direct-vectoring",
"interrupt-preemption",
"has-mie-mip",
"zero-bss",
"zero-rtc-fast-bss",
"init-data",
"init-rw-text",
"init-rtc-fast-data",
"init-rtc-fast-text",
]