From 16c2d4749e766fbecf31a6596585d4359cdadcff Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Thu, 2 May 2024 19:16:35 +0000 Subject: [PATCH 1/4] Update bump-crates.yml --- .github/workflows/bump-crates.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-crates.yml b/.github/workflows/bump-crates.yml index b2f688b302d1..66e138d145b6 100644 --- a/.github/workflows/bump-crates.yml +++ b/.github/workflows/bump-crates.yml @@ -110,7 +110,7 @@ jobs: git diff > bump.patch - name: Upload diff - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bump.patch path: bump.patch @@ -123,7 +123,7 @@ jobs: - name: Create Pull Request id: cpr - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.ATSAMD_BOT }} commit-message: ${{ github.event.inputs.bump }} bump of crate versions From 725806ba56365cb57df67028dedf9f4527fb5f6e Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Thu, 2 May 2024 19:33:11 +0000 Subject: [PATCH 2/4] Update bump-crates.yml --- .github/workflows/bump-crates.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/bump-crates.yml b/.github/workflows/bump-crates.yml index 66e138d145b6..1fba75b31d8f 100644 --- a/.github/workflows/bump-crates.yml +++ b/.github/workflows/bump-crates.yml @@ -107,6 +107,8 @@ jobs: - name: Generate patch shell: bash run: | + git config user.name atsamd-bot + git config user.email atsamd-bot@users.noreply.github.com git diff > bump.patch - name: Upload diff From ad8e435decfb0e0e95bb0b3ef526b5ef0e6a3544 Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Thu, 2 May 2024 20:24:44 +0000 Subject: [PATCH 3/4] Update bump-crates.yml --- .github/workflows/bump-crates.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bump-crates.yml b/.github/workflows/bump-crates.yml index 1fba75b31d8f..fd109535dcc7 100644 --- a/.github/workflows/bump-crates.yml +++ b/.github/workflows/bump-crates.yml @@ -31,7 +31,9 @@ jobs: run: | rustup set profile minimal rustup override set stable - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + ssh-key: ${{ secrets.ATSAMD_BOT_SSH_PRIVKEY }} - name: Setup shell: bash run: | @@ -107,8 +109,6 @@ jobs: - name: Generate patch shell: bash run: | - git config user.name atsamd-bot - git config user.email atsamd-bot@users.noreply.github.com git diff > bump.patch - name: Upload diff @@ -127,7 +127,6 @@ jobs: id: cpr uses: peter-evans/create-pull-request@v6 with: - token: ${{ secrets.ATSAMD_BOT }} commit-message: ${{ github.event.inputs.bump }} bump of crate versions committer: GitHub author: atsamd-bot From cc4590702b321b99338eb2e433052e8c461030c2 Mon Sep 17 00:00:00 2001 From: atsamd-bot Date: Thu, 2 May 2024 20:29:05 +0000 Subject: [PATCH 4/4] bump of crate versions --- Cargo.toml | 4 ---- boards/atsame54_xpro/Cargo.toml | 4 ++-- boards/feather_m0/Cargo.toml | 4 ++-- boards/feather_m4/Cargo.toml | 4 ++-- boards/metro_m0/Cargo.toml | 4 ++-- boards/metro_m4/Cargo.toml | 4 ++-- boards/samd11_bare/Cargo.toml | 4 ++-- hal/Cargo.toml | 2 +- 8 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 Cargo.toml diff --git a/Cargo.toml b/Cargo.toml deleted file mode 100644 index 54874e2ffc42..000000000000 --- a/Cargo.toml +++ /dev/null @@ -1,4 +0,0 @@ -[workspace] -resolver = "2" -members = ["hal", "atsamd-hal-macros"] -exclude = ["pac", "boards"] \ No newline at end of file diff --git a/boards/atsame54_xpro/Cargo.toml b/boards/atsame54_xpro/Cargo.toml index ad427bcce310..608afad27055 100644 --- a/boards/atsame54_xpro/Cargo.toml +++ b/boards/atsame54_xpro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "atsame54_xpro" -version = "0.6.0" +version = "0.7.0" authors = [ "Karsten Große ", "John Little " @@ -23,7 +23,7 @@ features = ["critical-section-single-core"] [dependencies.atsamd-hal] path = "../../hal" -version = "0.16.0" +version = "0.17.0" default-features = false [dependencies.usb-device] diff --git a/boards/feather_m0/Cargo.toml b/boards/feather_m0/Cargo.toml index e1408fb85623..c5ddced92172 100644 --- a/boards/feather_m0/Cargo.toml +++ b/boards/feather_m0/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "feather_m0" -version = "0.13.0" +version = "0.14.0" authors = ["Ben Bergman "] description = "Board Support crate for the Adafruit Feather M0" keywords = ["no-std", "arm", "cortex-m", "embedded-hal"] @@ -21,7 +21,7 @@ optional = true [dependencies.atsamd-hal] path = "../../hal" -version = "0.16.0" +version = "0.17.0" default-features = false [dependencies.cortex-m] diff --git a/boards/feather_m4/Cargo.toml b/boards/feather_m4/Cargo.toml index 03ea190917f2..4fcd5a6bbe8b 100644 --- a/boards/feather_m4/Cargo.toml +++ b/boards/feather_m4/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "feather_m4" -version = "0.11.0" +version = "0.12.0" edition = "2021" authors = ["Theodore DeRego "] description = "Board Support crate for the Adafruit Feather M4" @@ -25,7 +25,7 @@ features = ["critical-section-single-core"] [dependencies.atsamd-hal] path = "../../hal" -version = "0.16.0" +version = "0.17.0" default-features = false [dependencies.usb-device] diff --git a/boards/metro_m0/Cargo.toml b/boards/metro_m0/Cargo.toml index bbcaa5a9e0d2..6181434f178e 100644 --- a/boards/metro_m0/Cargo.toml +++ b/boards/metro_m0/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "metro_m0" -version = "0.13.0" +version = "0.14.0" authors = ["Wez Furlong "] description = "Board Support crate for the Adafruit Metro M0" keywords = ["no-std", "arm", "cortex-m", "embedded-hal"] @@ -24,7 +24,7 @@ features = ["critical-section-single-core"] [dependencies.atsamd-hal] path = "../../hal" -version = "0.16.0" +version = "0.17.0" default-features = false [dependencies.usb-device] diff --git a/boards/metro_m4/Cargo.toml b/boards/metro_m4/Cargo.toml index 7f2bcd0d64f8..b14f32fed55b 100644 --- a/boards/metro_m4/Cargo.toml +++ b/boards/metro_m4/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "metro_m4" -version = "0.12.0" +version = "0.13.0" authors = ["Paul Sajna ", "Wez Furlong "] description = "Board Support crate for the Adafruit Metro M4" keywords = ["no-std", "arm", "cortex-m", "embedded-hal"] @@ -20,7 +20,7 @@ optional = true [dependencies.atsamd-hal] path = "../../hal" -version = "0.16.0" +version = "0.17.0" default-features = false [dependencies.usb-device] diff --git a/boards/samd11_bare/Cargo.toml b/boards/samd11_bare/Cargo.toml index 068aaea8c1a7..2499d72500ea 100644 --- a/boards/samd11_bare/Cargo.toml +++ b/boards/samd11_bare/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "samd11_bare" -version = "0.9.0" +version = "0.10.0" authors = ["Jesse Braham "] description = "Support crate for the ATSAMD11C" keywords = ["no-std", "arm", "cortex-m", "embedded-hal"] @@ -23,7 +23,7 @@ features = ["critical-section-single-core"] [dependencies.atsamd-hal] path = "../../hal" -version = "0.16.0" +version = "0.17.0" default-features = false [dev-dependencies] diff --git a/hal/Cargo.toml b/hal/Cargo.toml index dced5199a59d..d793d3999c96 100644 --- a/hal/Cargo.toml +++ b/hal/Cargo.toml @@ -20,7 +20,7 @@ name = "atsamd-hal" readme = "README.md" repository = "https://github.com/atsamd-rs/atsamd" rust-version = "1.65" -version = "0.16.0" +version = "0.17.0" [package.metadata.docs.rs] features = ["samd21g", "samd21g-rt", "usb", "dma"]