change ci to use const generics and strict parsing

also merges CI to one status check

Author: Emilgardis

.github/bors.toml

@@ -2,21 +2,6 @@ block_labels = ["needs-decision", "S-waiting-on-team"]
 delete_merged_branches = true
 required_approvals = 1
 status = [
-  "ci-linux (stable, rustfmt, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, Atmel, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, Freescale, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, Fujitsu, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, Holtek, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, Nordic, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, Nuvoton, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, NXP, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, RISC-V, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, SiliconLabs, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, Spansion, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, STMicro, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, Toshiba, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (1.46.0, Nordic, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (stable, x86_64-apple-darwin, osx)",
-  "ci-linux (stable, x86_64-pc-windows-msvc, windows)",
+  "CI",
 ]
 timeout_sec = 14400

.github/workflows/ci.yml

@@ -6,6 +6,13 @@ on:
 name: Continuous integration
 
 jobs:
+  ci:
+    name: CI
+    runs-on: ubuntu-latest
+    needs: [ci-linux]
+    steps: 
+      - name: Done
+        run: exit 0
   ci-linux:
     runs-on: ubuntu-latest
     strategy:
@@ -15,7 +22,7 @@ jobs:
         rust: [stable]
 
         # All vendor files we want to test on stable
-        VENDOR: [rustfmt, Atmel, Freescale, Fujitsu, Holtek, Microchip, Nordic, Nuvoton, NXP, RISC-V, SiliconLabs, Spansion, STMicro, Toshiba]
+        vendor: [rustfmt, Atmel, Freescale, Fujitsu, Holtek, Microchip, Nordic, Nuvoton, NXP, RISC-V, SiliconLabs, Spansion, STMicro, Toshiba]
 
         # The default target we're compiling on and for
         TARGET: [x86_64-unknown-linux-gnu]
@@ -25,33 +32,35 @@ jobs:
 
         FEATURES: [""]
 
-        OPTIONS: [""]
-
+        # Options are all, none, strict and const
+        options: [all, none]
+        exclude:
+          - vendor: Fujitsu
+            options: all
+          - vendor: Spansion
+            options: all
+          - vendor: STMicro
+            options: all
+          - vendor: Nuvoton
+            options: all
         include:
           # Test MSRV
           - rust: 1.46.0
-            VENDOR: Nordic
-            TARGET: x86_64-unknown-linux-gnu
-            TRAVIS_OS_NAME: linux
-
-          # Test features
-          - rust: 1.51.0
-            VENDOR: RISC-V
+            vendor: Nordic
             TARGET: x86_64-unknown-linux-gnu
             TRAVIS_OS_NAME: linux
-            OPTIONS: "--const_generic --strict"
 
           # Use nightly for architectures which don't support stable
           - rust: nightly
             experimental: true
-            VENDOR: OTHER
+            vendor: OTHER
             TARGET: x86_64-unknown-linux-gnu
             TRAVIS_OS_NAME: linux
 
             # Use nightly for architectures which don't support stable
           - rust: nightly
             experimental: true
-            VENDOR: Espressif
+            vendor: Espressif
             TARGET: x86_64-unknown-linux-gnu
             TRAVIS_OS_NAME: linux
 
@@ -74,5 +83,11 @@ jobs:
           target: ${{ matrix.TARGET }}
           override: true
           components: rustfmt
-      - name: Run CI script for ${{ matrix.VENDOR }} under ${{ matrix.rust }}
-        run: TARGET=${{ matrix.TARGET }} VENDOR=${{ matrix.VENDOR }} TRAVIS_OS_NAME=${{ matrix.TRAVIS_OS_NAME }} FEATURES=${{ matrix.FEATURES }} OPTIONS=${{ matrix.OPTIONS }} bash ci/script.sh
+      - name: Run CI script for `${{ matrix.vendor }}` under rust `${{ matrix.rust }}` with options=`${{ matrix.options }}`
+        env:
+          TARGET: ${{ matrix.TARGET }}
+          VENDOR: ${{ matrix.vendor }}
+          FEATURES: ${{ matrix.FEATURES }}
+          OPTIONS: ${{ matrix.options }} 
+          TRAVIS_OS_NAME: ${{ matrix.TRAVIS_OS_NAME }}
+        run: bash ci/script.sh

ci/script.sh

@@ -10,7 +10,7 @@ test_svd() {
     # NOTE we care about errors in svd2rust, but not about errors / warnings in rustfmt
     local cwd=$(pwd)
     pushd $td
-    RUST_BACKTRACE=1 $cwd/target/$TARGET/release/svd2rust -i $OPTIONS ${1}.svd
+    RUST_BACKTRACE=1 $cwd/target/$TARGET/release/svd2rust $strict $const_generic -i ${1}.svd
 
     mv lib.rs src/lib.rs
 
@@ -70,6 +70,25 @@ main() {
             ;;
     esac
 
+    case $OPTIONS in
+        all)
+            const_generic="--const_generic"
+            strict="--strict"
+            ;;
+        strict)
+            const_generic=""
+            strict="--strict"
+            ;;
+        const)
+            const_generic="--const_generic"
+            strict=""
+            ;;
+        *)
+            const_generic=""
+            strict=""
+            ;;
+    esac
+
     # test crate
     cargo init --name foo $td
     echo 'cortex-m = "0.7.0"' >> $td/Cargo.toml