Merge branch 'master' into state_refactor

ClementTsang · Oct 31, 2021 · 5833cb8 · 5833cb8
2 parents f02daa0 + 77ada57
commit 5833cb8
Show file tree

Hide file tree

Showing 17 changed files with 472 additions and 423 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -1,5 +1,8 @@
+# A routine check to see if there are any Rust-specific security vulnerabilities in the repo we should be aware of.
+
 name: audit
 on:
+  workflow_dispatch:
   schedule:
     - cron: "0 0 * * 1"
 jobs:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -69,7 +69,7 @@ jobs:
 
       - run: cargo clippy --all-targets --workspace -- -D warnings
 
-  # Compile/check/test.
+  # Run cargo --check on all platforms
   check:
     needs: [rustfmt, clippy]
     runs-on: ${{ matrix.triple.os }}
@@ -78,65 +78,55 @@ jobs:
       fail-fast: false
       matrix:
         triple:
-          # Standard x86-64 stuff, stable
+          # x86 or x64
           - {
               os: "ubuntu-latest",
               target: "x86_64-unknown-linux-gnu",
               cross: false,
               rust: stable,
-              toTest: "true",
             }
           - {
               os: "ubuntu-latest",
               target: "i686-unknown-linux-gnu",
               cross: true,
               rust: stable,
             }
-          # - {
-          #     os: "ubuntu-latest",
-          #     target: "x86_64-unknown-linux-musl",
-          #     cross: false,
-          #     rust: stable,
-          #   }
-          # - {
-          #     os: "ubuntu-latest",
-          #     target: "i686-unknown-linux-musl",
-          #     cross: true,
-          #     rust: stable,
-          #   }
+          - {
+              os: "ubuntu-latest",
+              target: "x86_64-unknown-linux-musl",
+              cross: false,
+              rust: stable,
+            }
+          - {
+              os: "ubuntu-latest",
+              target: "i686-unknown-linux-musl",
+              cross: true,
+              rust: stable,
+            }
           - {
               os: "macOS-latest",
               target: "x86_64-apple-darwin",
               cross: false,
               rust: stable,
-              toTest: "true",
             }
-          # Big Sur builds are disabled, unfortunately.
-          # - {
-          #     os: "macOS-11.0",
-          #     target: "x86_64-apple-darwin",
-          #     cross: false,
-          #     rust: stable,
-          #   }
           - {
               os: "windows-2019",
               target: "x86_64-pc-windows-msvc",
               cross: false,
               rust: stable,
-              toTest: "true",
             }
           - {
               os: "windows-2019",
               target: "i686-pc-windows-msvc",
-              cross: true,
+              cross: false,
+              rust: stable,
+            }
+          - {
+              os: "windows-2019",
+              target: "x86_64-pc-windows-gnu",
+              cross: false,
               rust: stable,
             }
-          # - {
-          #     os: "windows-2019",
-          #     target: "x86_64-pc-windows-gnu",
-          #     cross: false,
-          #     rust: stable,
-          #   }
 
           # aarch64
           - {
@@ -208,16 +198,100 @@ jobs:
           args: --all-targets --verbose --target=${{ matrix.triple.target }} --features "battery"
           use-cross: ${{ matrix.triple.cross }}
 
+  # Check without the battery feature enabled on x86-64 for supported operating systems
+  check-without-battery:
+    needs: [rustfmt, clippy]
+    runs-on: ${{ matrix.triple.os }}
+    continue-on-error: true
+    strategy:
+      fail-fast: false
+      matrix:
+        triple:
+          - {
+              os: "ubuntu-latest",
+              target: "x86_64-unknown-linux-gnu",
+              cross: false,
+              rust: stable,
+            }
+          - {
+              os: "macOS-latest",
+              target: "x86_64-apple-darwin",
+              cross: false,
+              rust: stable,
+            }
+          - {
+              os: "windows-2019",
+              target: "x86_64-pc-windows-msvc",
+              cross: false,
+              rust: stable,
+            }
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.triple.rust }}
+          override: true
+          target: ${{ matrix.triple.target }}
+
+      - uses: Swatinem/rust-cache@v1
+        with:
+          key: ${{ matrix.triple.target }}
+
       - name: Check without battery feature on the main 3
-        if: matrix.triple.toTest == 'true'
         uses: actions-rs/cargo@v1
         with:
           command: check
-          args: --all-targets --verbose --target=${{ matrix.triple.target }}
+          args: --all-targets --verbose --target=${{ matrix.triple.target }} --no-default-features
           use-cross: ${{ matrix.triple.cross }}
 
+  # Run tests x86-64 for supported operating systems
+  test:
+    needs: [rustfmt, clippy]
+    runs-on: ${{ matrix.triple.os }}
+    continue-on-error: true
+    strategy:
+      fail-fast: false
+      matrix:
+        triple:
+          - {
+              os: "ubuntu-latest",
+              target: "x86_64-unknown-linux-gnu",
+              cross: false,
+              rust: stable,
+            }
+          - {
+              os: "macOS-latest",
+              target: "x86_64-apple-darwin",
+              cross: false,
+              rust: stable,
+            }
+          - {
+              os: "windows-2019",
+              target: "x86_64-pc-windows-msvc",
+              cross: false,
+              rust: stable,
+            }
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.triple.rust }}
+          override: true
+          target: ${{ matrix.triple.target }}
+
+      - uses: Swatinem/rust-cache@v1
+        with:
+          key: ${{ matrix.triple.target }}
+
       - name: Run tests
-        if: matrix.triple.toTest == 'true'
         run: cargo test --no-fail-fast
         env:
           CARGO_HUSKY_DONT_INSTALL_HOOKS: true