diff --git a/.github/workflows/check.yml b/.github/workflows/build_and_test.yml similarity index 75% rename from .github/workflows/check.yml rename to .github/workflows/build_and_test.yml index 9c21c27..d1cba7b 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/build_and_test.yml @@ -1,5 +1,5 @@ on: [push, pull_request] -name: CI Checks +name: Build and Test check jobs: check: name: cargo-check @@ -14,10 +14,18 @@ jobs: target: thumbv6m-none-eabi override: true profile: minimal + - uses: actions-rs/cargo@v1 + with: + command: check + args: --workspace --examples - uses: actions-rs/cargo@v1 with: command: check args: --workspace --examples --features eh1_0_alpha + - uses: actions-rs/cargo@v1 + with: + command: build + args: --workspace --all - uses: actions-rs/cargo@v1 with: command: test diff --git a/.github/workflows/tests_host.yml b/.github/workflows/tests_host.yml deleted file mode 100644 index 357428b..0000000 --- a/.github/workflows/tests_host.yml +++ /dev/null @@ -1,21 +0,0 @@ -on: [push, pull_request] -name: On-host tests -jobs: - check: - name: Check and Lint - runs-on: ubuntu-20.04 - env: - RUSTFLAGS: "-D warnings" - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: thumbv6m-none-eabi - override: true - profile: minimal - ## Tests are currently not working on host - disabled until we can find a good solution - # - uses: actions-rs/cargo@v1 - # with: - # command: test - # args: --target x86_64-unknown-linux-gnu diff --git a/boards/feather_rp2040/Cargo.toml b/boards/feather_rp2040/Cargo.toml index 944fbc0..5c2dcf2 100644 --- a/boards/feather_rp2040/Cargo.toml +++ b/boards/feather_rp2040/Cargo.toml @@ -21,8 +21,8 @@ panic-halt= "0.2.0" embedded-hal ="0.2.5" nb = "1.0.0" smart-leds = "0.3.0" -pio = { git = "https://github.com/rp-rs/pio-rs.git", branch = "main" } -ws2812-pio = { git = "https://github.com/ithinuel/ws2812-pio-rs", rev = "7a11616f994025f5c99f28b283d2b25d60d46a43" } +pio = "0.1.0" +ws2812-pio = { git = "https://github.com/ithinuel/ws2812-pio-rs", rev = "4f0d81e594ea9934f9c4c38ed9824ad0cce4ebb5" } [features] default = ["boot2", "rt"] diff --git a/boards/itsy_bitsy_rp2040/Cargo.toml b/boards/itsy_bitsy_rp2040/Cargo.toml index 731e5b9..4b308df 100644 --- a/boards/itsy_bitsy_rp2040/Cargo.toml +++ b/boards/itsy_bitsy_rp2040/Cargo.toml @@ -21,8 +21,8 @@ panic-halt= "0.2.0" embedded-hal ="0.2.5" smart-leds = "0.3" nb = "1.0.0" -pio = { git = "https://github.com/rp-rs/pio-rs.git", branch = "main" } -ws2812-pio = { git = "https://github.com/ithinuel/ws2812-pio-rs", rev = "7a11616f994025f5c99f28b283d2b25d60d46a43" } +pio = "0.1.0" +ws2812-pio = { git = "https://github.com/ithinuel/ws2812-pio-rs", rev = "4f0d81e594ea9934f9c4c38ed9824ad0cce4ebb5" } [features] default = ["rt", "boot2"] diff --git a/boards/kb2040/Cargo.toml b/boards/kb2040/Cargo.toml index 856cab1..5a3794c 100644 --- a/boards/kb2040/Cargo.toml +++ b/boards/kb2040/Cargo.toml @@ -25,5 +25,5 @@ rp2040-boot2 = "0.2" smart-leds = "0.3.0" embedded-time = "0.12.0" nb = "1.0.0" -pio = { git = "https://github.com/rp-rs/pio-rs.git", branch = "main" } -ws2812-pio = { git = "https://github.com/ithinuel/ws2812-pio-rs", rev = "7a11616f994025f5c99f28b283d2b25d60d46a43" } +pio = "0.1.0" +ws2812-pio = { git = "https://github.com/ithinuel/ws2812-pio-rs", rev = "4f0d81e594ea9934f9c4c38ed9824ad0cce4ebb5" } diff --git a/boards/pico/Cargo.toml b/boards/pico/Cargo.toml index 5dc22e6..066db5f 100644 --- a/boards/pico/Cargo.toml +++ b/boards/pico/Cargo.toml @@ -38,7 +38,7 @@ panic-halt= "0.2.0" embedded-hal ="0.2.5" cortex-m-rtic = "0.6.0-rc.4" nb = "1.0" -i2c-pio = { git = "https://github.com/ithinuel/i2c-pio-rs", rev = "afc2dad0e955da2b712d7f7cd78c7af88ddc6a45" } +i2c-pio = { git = "https://github.com/ithinuel/i2c-pio-rs", rev = "df06e4ac94a5b2c985d6a9426dc4cc9be0d535c0" } [features] default = ["boot2", "rt"] diff --git a/boards/pro_micro_rp2040/Cargo.toml b/boards/pro_micro_rp2040/Cargo.toml index 82b68a4..053cc38 100644 --- a/boards/pro_micro_rp2040/Cargo.toml +++ b/boards/pro_micro_rp2040/Cargo.toml @@ -21,8 +21,8 @@ panic-halt = "0.2.0" smart-leds = "0.3.0" embedded-time = "0.12.0" nb = "1.0.0" -pio = { git = "https://github.com/rp-rs/pio-rs.git", branch = "main" } -ws2812-pio = { git = "https://github.com/ithinuel/ws2812-pio-rs", rev = "7a11616f994025f5c99f28b283d2b25d60d46a43" } +pio = "0.1.0" +ws2812-pio = { git = "https://github.com/ithinuel/ws2812-pio-rs", rev = "4f0d81e594ea9934f9c4c38ed9824ad0cce4ebb5" } [features] default = ["boot2", "rt"] diff --git a/boards/qt_py_rp2040/Cargo.toml b/boards/qt_py_rp2040/Cargo.toml index a38b122..d4aee7c 100644 --- a/boards/qt_py_rp2040/Cargo.toml +++ b/boards/qt_py_rp2040/Cargo.toml @@ -21,8 +21,8 @@ panic-halt= "0.2.0" embedded-hal ="0.2.5" smart-leds = "0.3" nb = "1.0.0" -pio = { git = "https://github.com/rp-rs/pio-rs.git", branch = "main" } -ws2812-pio = { git = "https://github.com/ithinuel/ws2812-pio-rs", rev = "7a11616f994025f5c99f28b283d2b25d60d46a43" } +pio = "0.1.0" +ws2812-pio = { git = "https://github.com/ithinuel/ws2812-pio-rs", rev = "4f0d81e594ea9934f9c4c38ed9824ad0cce4ebb5" } [features] default = ["boot2", "rt"] diff --git a/rp2040-hal/Cargo.toml b/rp2040-hal/Cargo.toml index 563c338..fdb766d 100644 --- a/rp2040-hal/Cargo.toml +++ b/rp2040-hal/Cargo.toml @@ -18,7 +18,7 @@ itertools = { version = "0.10.1", default-features = false } nb = "1.0" rp2040-pac = "0.2.0" paste = "1.0" -pio = { git = "https://github.com/rp-rs/pio-rs.git", branch = "main" } +pio = "0.1.0" usb-device = "0.2.8" vcell = "0.1" void = { version = "1.0.2", default-features = false } @@ -41,7 +41,7 @@ cortex-m-rt = "0.7" panic-halt = "0.2.0" rp2040-boot2 = "0.2.0" hd44780-driver = "0.4.0" -pio-proc = { git = "https://github.com/rp-rs/pio-rs.git", branch = "main" } +pio-proc = "0.1.0" [features] rt = ["rp2040-pac/rt"]