workflows fix test

google · Mar 7, 2023 · e441ed7 · e441ed7
1 parent 28089dd
commit e441ed7
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 862 deletions.
diff --git a/.github/workflows/cargo_fmt.yml b/.github/workflows/cargo_fmt.yml
@@ -45,52 +45,52 @@ jobs:
         with:
           toolchain: nightly
           command: fmt
-          args: --manifest-path libraries/opensk/Cargo.toml --all -- --check
+          args: --manifest-path libraries/opensk/Cargo.toml -- --check
 
       - name: Cargo format libraries/opensk/fuzz
         uses: actions-rs/cargo@v1
         with:
           toolchain: nightly
           command: fmt
-          args: --manifest-path libraries/opensk/fuzz/Cargo.toml --all -- --check
+          args: --manifest-path libraries/opensk/fuzz/Cargo.toml -- --check
 
       - name: Cargo format libraries/cbor
         uses: actions-rs/cargo@v1
         with:
           toolchain: nightly
           command: fmt
-          args: --manifest-path libraries/cbor/Cargo.toml --all -- --check
+          args: --manifest-path libraries/cbor/Cargo.toml -- --check
 
       - name: Cargo format libraries/cbor/fuzz
         uses: actions-rs/cargo@v1
         with:
           toolchain: nightly
           command: fmt
-          args: --manifest-path libraries/cbor/fuzz/Cargo.toml --all -- --check
+          args: --manifest-path libraries/cbor/fuzz/Cargo.toml -- --check
 
       - name: Cargo format libraries/crypto
         uses: actions-rs/cargo@v1
         with:
           toolchain: nightly
           command: fmt
-          args: --manifest-path libraries/crypto/Cargo.toml --all -- --check
+          args: --manifest-path libraries/crypto/Cargo.toml -- --check
 
       - name: Cargo format libraries/persistent_store
         uses: actions-rs/cargo@v1
         with:
           toolchain: nightly
           command: fmt
-          args: --manifest-path libraries/persistent_store/Cargo.toml --all -- --check
+          args: --manifest-path libraries/persistent_store/Cargo.toml -- --check
 
       - name: Cargo format tools/heapviz
         uses: actions-rs/cargo@v1
         with:
           toolchain: nightly
           command: fmt
-          args: --manifest-path tools/heapviz/Cargo.toml --all -- --check
+          args: --manifest-path tools/heapviz/Cargo.toml -- --check
 
       - name: Cargo format bootloader
         uses: actions-rs/cargo@v1
         with:
           command: fmt
-          args: --manifest-path bootloader/Cargo.toml --all -- --check
+          args: --manifest-path bootloader/Cargo.toml -- --check
diff --git a/.github/workflows/cargo_fuzz.yml b/.github/workflows/cargo_fuzz.yml
@@ -26,8 +26,8 @@ jobs:
         run: ./fuzzing_setup.sh
 
       - name: Cargo fuzz build
-        run: cd libraries/opensk && cargo fuzz build && cd ../..
+        run: cd libraries/opensk && cargo +nightly fuzz build
       - name: Cargo fuzz build (libraries/cbor)
-        run: cd libraries/cbor && cargo fuzz build && cd ../..
+        run: cd libraries/cbor && cargo +nightly fuzz build &&
       - name: Cargo fuzz build (libraries/persistent_store)
-        run: cd libraries/persistent_store && cargo fuzz build && cd ../..
+        run: cd libraries/persistent_store && cargo +nightly fuzz build
diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
@@ -3,7 +3,6 @@ name: OpenSK code coverage report
 on:
   push:
     paths:
-      - 'src/**/*.rs'
       - 'libraries/**/*.rs'
   pull_request:
     types: [opened, synchronize, reopened]
@@ -27,22 +26,26 @@ jobs:
       - name: Set up OpenSK
         run: ./setup.sh
       - name: Install llvm tools
-        run: rustup component add llvm-tools-preview
+        run: rustup +nightly component add llvm-tools-preview
 
       - name: Install grcov
         run: if [[ ! -e ~/.cargo/bin/grcov ]]; then cargo +stable install grcov; fi
       - uses: actions-rs/cargo@v1
         with:
+          toolchain: nightly
           command: test
-          args: --features "with_ctap1,vendor_hid,ed25519,with_nfc,std" --no-fail-fast
+          args: --manifest-path libraries/opensk/Cargo.toml --features "std,with_ctap1,vendor_hid,ed25519" --no-fail-fast
         env:
-          RUSTFLAGS: "-Zinstrument-coverage"
+          RUSTFLAGS: "-Cinstrument-coverage"
           LLVM_PROFILE_FILE: "opensk-%p-%m.profraw"
+      - name: =========== TEST PRINT ==========
+        run: cat lcov.info
       - name: Run grcov
-        run: grcov . --binary-path ./target/debug/ --source-dir . --output-type lcov --ignore-not-existing ---output-path ./lcov.info --ignore "/*" --ignore "examples/*" --ignore "third_party/*"
+        run: RUSTUP_TOOLCHAIN=nightly grcov . --binary-path ./libraries/opensk/target/debug/ --source-dir libraries/opensk/ --output-type lcov --ignore-not-existing ---output-path ./lcov.info --ignore "/*" --ignore "examples/*" --ignore "third_party/*"
       - uses: coverallsapp/github-action@1.1.3
         name: upload report to coveralls
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: "./lcov.info"
+          base-path: "libraries/opensk
 
diff --git a/libraries/cbor/fuzz/Cargo.lock b/libraries/cbor/fuzz/Cargo.lock