Merge pull request #225 from rust-embedded/update-actions

update ci & deprecate bors

Author: burrbull

.github/bors.toml

@@ -1,62 +1,67 @@
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: master
   pull_request:
+  merge_group:
 
 name: Continuous Integration
 
 jobs:
+  ci:
+    name: CI
+    runs-on: ubuntu-latest
+    needs: [build, test, test-strict]
+    if: always()
+    steps:
+      - name: Done
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
+
   # check if the project builds with MSRV, stable and nighly
   build:
+    name: "Build (${{ matrix.name || matrix.rust }})"
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental || false }}
     strategy:
       matrix:
-        rust: [ 1.56.0, stable ]
+        rust: [ stable ]
         include:
           # Test nightly but don't fail the build.
           - rust: nightly
             experimental: true
+          # MSRV
+          - rust: 1.58.0
+            name: "MSRV"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          profile: minimal
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
+          components: clippy
+      - run: cargo check
+        env:
+          RUSTFLAGS: -D warnings
+      - run: cargo clippy
 
   test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          profile: minimal
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
+      - run: cargo test
 
   test-strict:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          profile: minimal
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all-features
+      - run: cargo test --all-features

.github/workflows/ci.yml

@@ -1,7 +1,8 @@
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: master
   pull_request:
+  merge_group:
 
 name: Code formatting check
 
@@ -11,13 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: stable
-          override: true
           components: rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+      - run: cargo fmt --all -- --check

.github/workflows/clippy.yml

@@ -10,7 +10,7 @@ It consists of:
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.56.0 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.58.0 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 ## License

.github/workflows/rustfmt.yml

@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 name = "svd-encoder"
 repository = "https://github.com/rust-embedded/svd"
 edition = "2021"
-rust-version = "1.56.0"
+rust-version = "1.58.0"
 version = "0.14.3"
 readme = "README.md"
 

README.md

@@ -13,7 +13,7 @@ This project is developed and maintained by the [Tools team][team].
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.56.0 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.58.0 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 ## License

cmsis-svd

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+- Bump MSRV to 1.58.0
+
 ## [v0.14.1] - 2022-10-23
 
 - Update to `svd-rs` 0.14.1

svd-encoder/Cargo.toml

@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
 name = "svd-parser"
 repository = "https://github.com/rust-embedded/svd"
 edition = "2021"
-rust-version = "1.56.0"
+rust-version = "1.58.0"
 version = "0.14.1"
 readme = "README.md"