Skip to content

Commit 6cc7531

Browse files
DirbaioDirbaio
authored
Merge pull request #4654 from embassy-rs/devtool-ci
ci: use devtool to build.
2 parents 49a7770 + 55b3c5c commit 6cc7531

File tree

14 files changed

+68
-403
lines changed

14 files changed

+68
-403
lines changed

‎.github/ci/build-nightly.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set -euo pipefail
77
export RUSTUP_HOME=/ci/cache/rustup
88
export CARGO_HOME=/ci/cache/cargo
99
export CARGO_TARGET_DIR=/ci/cache/target
10+
export PATH=$CARGO_HOME/bin:$PATH
1011
mv rust-toolchain-nightly.toml rust-toolchain.toml
1112

1213
# needed for "dumb HTTP" transport support
@@ -22,6 +23,8 @@ fi
2223
hashtime restore /ci/cache/filetime.json || true
2324
hashtime save /ci/cache/filetime.json
2425

26+
cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev 280829ad163f1444999468a57d28fb7c412babbe
27+
2528
./ci-nightly.sh
2629

2730
# Save lockfiles

‎.github/ci/build-xtensa.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ set -euo pipefail
77
export RUSTUP_HOME=/ci/cache/rustup
88
export CARGO_HOME=/ci/cache/cargo
99
export CARGO_TARGET_DIR=/ci/cache/target
10+
export PATH=$CARGO_HOME/bin:$PATH
1011

1112
# needed for "dumb HTTP" transport support
1213
# used when pointing stm32-metapac to a CI-built one.
1314
export CARGO_NET_GIT_FETCH_WITH_CLI=true
1415

15-
cargo install espup
16-
/ci/cache/cargo/bin/espup install --toolchain-version 1.84.0.0
16+
cargo install espup --locked
17+
espup install --toolchain-version 1.88.0.0
1718

1819
# Restore lockfiles
1920
if [ -f /ci/cache/lockfiles.tar ]; then
@@ -24,11 +25,7 @@ fi
2425
hashtime restore /ci/cache/filetime.json || true
2526
hashtime save /ci/cache/filetime.json
2627

27-
mkdir .cargo
28-
cat > .cargo/config.toml<< EOF
29-
[unstable]
30-
build-std = ["alloc", "core"]
31-
EOF
28+
cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev 280829ad163f1444999468a57d28fb7c412babbe
3229

3330
./ci-xtensa.sh
3431

‎.github/ci/build.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set -euo pipefail
77
export RUSTUP_HOME=/ci/cache/rustup
88
export CARGO_HOME=/ci/cache/cargo
99
export CARGO_TARGET_DIR=/ci/cache/target
10+
export PATH=$CARGO_HOME/bin:$PATH
1011
if [ -f /ci/secrets/teleprobe-token.txt ]; then
1112
echo Got teleprobe token!
1213
export TELEPROBE_HOST=https://teleprobe.embassy.dev
@@ -27,6 +28,8 @@ fi
2728
hashtime restore /ci/cache/filetime.json || true
2829
hashtime save /ci/cache/filetime.json
2930

31+
cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev 280829ad163f1444999468a57d28fb7c412babbe
32+
3033
./ci.sh
3134

3235
# Save lockfiles

‎ci-nightly.sh‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,4 @@ if [[ -z "${CARGO_TARGET_DIR}" ]]; then
88
export CARGO_TARGET_DIR=target_ci
99
fi
1010

11-
cargo batch \
12-
--- build --release --manifest-path embassy-executor/Cargo.toml --target thumbv7em-none-eabi --features nightly \
13-
--- build --release --manifest-path embassy-executor/Cargo.toml --target thumbv7em-none-eabi --features nightly,log \
14-
--- build --release --manifest-path embassy-executor/Cargo.toml --target thumbv7em-none-eabi --features nightly,defmt \
15-
--- build --release --manifest-path embassy-executor/Cargo.toml --target thumbv6m-none-eabi --features nightly,defmt \
16-
--- build --release --manifest-path embassy-executor/Cargo.toml --target thumbv6m-none-eabi --features nightly,defmt,arch-cortex-m,executor-thread,executor-interrupt \
17-
--- build --release --manifest-path embassy-executor/Cargo.toml --target thumbv7em-none-eabi --features nightly,arch-cortex-m \
18-
--- build --release --manifest-path embassy-executor/Cargo.toml --target thumbv7em-none-eabi --features nightly,arch-cortex-m,executor-thread \
19-
--- build --release --manifest-path embassy-executor/Cargo.toml --target thumbv7em-none-eabi --features nightly,arch-cortex-m,executor-interrupt \
20-
--- build --release --manifest-path embassy-executor/Cargo.toml --target thumbv7em-none-eabi --features nightly,arch-cortex-m,executor-thread,executor-interrupt \
21-
--- build --release --manifest-path embassy-executor/Cargo.toml --target riscv32imac-unknown-none-elf --features nightly,arch-riscv32 \
22-
--- build --release --manifest-path embassy-executor/Cargo.toml --target riscv32imac-unknown-none-elf --features nightly,arch-riscv32,executor-thread \
23-
--- build --release --manifest-path examples/nrf52840-rtic/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/nrf52840-rtic \
24-
--- build --release --manifest-path embassy-executor/Cargo.toml --target armv7a-none-eabi --features nightly,arch-cortex-ar,executor-thread \
25-
26-
RUSTFLAGS="$RUSTFLAGS -C target-cpu=atmega328p" cargo build --release --manifest-path embassy-executor/Cargo.toml --target avr-none -Z build-std=core,alloc --features nightly,arch-avr,avr-device/atmega328p
11+
cargo embassy-devtool build --group nightly

‎ci-xtensa.sh‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,4 @@ if [[ -z "${CARGO_TARGET_DIR}" ]]; then
99
export CARGO_TARGET_DIR=target_ci
1010
fi
1111

12-
cargo batch \
13-
--- build --release --manifest-path embassy-executor/Cargo.toml --target xtensa-esp32-none-elf \
14-
--- build --release --manifest-path embassy-executor/Cargo.toml --target xtensa-esp32-none-elf --features log \
15-
--- build --release --manifest-path embassy-executor/Cargo.toml --target xtensa-esp32-none-elf --features defmt \
16-
--- build --release --manifest-path embassy-executor/Cargo.toml --target xtensa-esp32s2-none-elf --features defmt \
17-
--- build --release --manifest-path embassy-executor/Cargo.toml --target xtensa-esp32-none-elf --features defmt,arch-spin,executor-thread \
18-
--- build --release --manifest-path embassy-executor/Cargo.toml --target xtensa-esp32s2-none-elf --features defmt,arch-spin,executor-thread \
19-
--- build --release --manifest-path embassy-executor/Cargo.toml --target xtensa-esp32s3-none-elf --features defmt,arch-spin,executor-thread \
20-
--- build --release --manifest-path embassy-executor/Cargo.toml --target xtensa-esp32-none-elf --features arch-spin \
21-
--- build --release --manifest-path embassy-executor/Cargo.toml --target xtensa-esp32-none-elf --features arch-spin,rtos-trace \
22-
--- build --release --manifest-path embassy-executor/Cargo.toml --target xtensa-esp32-none-elf --features arch-spin,executor-thread \
23-
--- build --release --manifest-path embassy-sync/Cargo.toml --target xtensa-esp32s2-none-elf --features defmt \
24-
--- build --release --manifest-path embassy-time/Cargo.toml --target xtensa-esp32s2-none-elf --features defmt,defmt-timestamp-uptime,mock-driver \
25-
--- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target xtensa-esp32s2-none-elf \
26-
--- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target xtensa-esp32s2-none-elf --features generic-queue-8 \
27-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv4,medium-ethernet,packet-trace \
28-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv4,multicast,medium-ethernet \
29-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,dhcpv4,medium-ethernet \
30-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,dhcpv4,medium-ethernet,dhcpv4-hostname \
31-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv6,medium-ethernet \
32-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv6,medium-ieee802154 \
33-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv6,medium-ethernet,medium-ieee802154 \
34-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv6,medium-ethernet \
35-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv4,proto-ipv6,medium-ethernet \
36-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv4,proto-ipv6,medium-ip \
37-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv4,proto-ipv6,medium-ip,medium-ethernet \
38-
--- build --release --manifest-path embassy-net/Cargo.toml --target xtensa-esp32-none-elf --features defmt,tcp,udp,dns,proto-ipv4,proto-ipv6,medium-ip,medium-ethernet,medium-ieee802154 \
12+
cargo embassy-devtool build --group xtensa

0 commit comments

Comments
 (0)