Merge pull request #214 from embassy-rs/build-generated

Automatically commit build results to the stm32-data-generated repo.
This commit is contained in:
Dario Nieuwenhuis 2023-07-02 13:51:18 +00:00 committed by GitHub
commit 9b4f530da2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 4 deletions

23
.github/ci/generated.sh vendored Executable file
View File

@ -0,0 +1,23 @@
#!/bin/bash
## on push branch=main
## permission contents write
## permission_repo stm32-data-generated
set -euxo pipefail
export RUSTUP_HOME=/ci/cache/rustup
export CARGO_HOME=/ci/cache/cargo
export CARGO_TARGET_DIR=/ci/cache/target
hashtime restore /ci/cache/filetime.json || true
hashtime save /ci/cache/filetime.json
git clone https://github.com/embassy-rs/stm32-data-generated/ build
./d ci
COMMIT=$(git rev-parse HEAD)
cd build
git add data stm32-metapac
git commit -m "Generated from stm32-data $COMMIT"
git tag -a stm32-data-$COMMIT -m "Generated from stm32-data $COMMIT"
git push --follow-tags

2
Cargo.lock generated
View File

@ -49,7 +49,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chiptool"
version = "0.1.0"
source = "git+https://github.com/embassy-rs/chiptool?rev=d29063045446448526e3e0c19857f10e32992386#d29063045446448526e3e0c19857f10e32992386"
source = "git+https://github.com/embassy-rs/chiptool?rev=0621765f915cedb0a9242a888c1909374ebbf4fa#0621765f915cedb0a9242a888c1909374ebbf4fa"
dependencies = [
"anyhow",
"clap",

4
d
View File

@ -42,7 +42,9 @@ case "$CMD" in
rm -rf build/{data,stm32-metapac}
cargo run --release --bin stm32-data-gen
cargo run --release --bin stm32-metapac-gen
(cd build/stm32-metapac && cargo check --features stm32h755zi-cm7,pac,metadata)
cd build/stm32-metapac
find . -name '*.rs' -not -path '*target*' | xargs rustfmt --skip-children --unstable-features --edition 2021
cargo check --features stm32h755zi-cm7,pac,metadata
;;
*)
echo "unknown command"

View File

@ -17,7 +17,7 @@ quick-xml = { version = "0.26.0", features = ["serialize"] }
regex = "1.7.1"
serde = { version = "1.0.157", features = ["derive"] }
serde_yaml = "0.9.19"
chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "d29063045446448526e3e0c19857f10e32992386" }
chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "0621765f915cedb0a9242a888c1909374ebbf4fa" }
serde_json = "1.0.94"
rayon = { version = "1.7.0", optional = true }
stm32-data-serde = { version = "0.1.0", path = "../stm32-data-serde" }

View File

@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
regex = "1.7.1"
chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "d29063045446448526e3e0c19857f10e32992386" }
chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "0621765f915cedb0a9242a888c1909374ebbf4fa" }
serde = { version = "1.0.157", features = [ "derive" ] }
serde_json = "1.0.94"
proc-macro2 = "1.0.52"