From 258c93c12539409e288ad26a0bc86df08b1d579e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= <newpavlov@gmail.com>
Date: Tue, 7 Dec 2021 23:19:15 +0300
Subject: [PATCH] tweak workflow

---
 .github/workflows/hkdf.yml | 74 ++++++++++++++------------------------
 1 file changed, 27 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/hkdf.yml b/.github/workflows/hkdf.yml
index 19f46f5..d5d60fa 100644
--- a/.github/workflows/hkdf.yml
+++ b/.github/workflows/hkdf.yml
@@ -17,61 +17,41 @@ env:
   RUSTFLAGS: "-Dwarnings"
 
 jobs:
-  test:
+  build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - target: i686-unknown-linux-gnu
-            toolchain: 1.41.0 # MSRV
-            use_cross: false
-            deps: sudo apt install gcc-multilib
-          - target: i686-unknown-linux-gnu
-            toolchain: stable
-            use_cross: false
-            deps: sudo apt install gcc-multilib
-          - target: x86_64-unknown-linux-gnu
-            toolchain: 1.41.0 # MSRV
-            use_cross: false
-            deps: true
-          - target: x86_64-unknown-linux-gnu
-            toolchain: stable
-            use_cross: false
-            deps: true
-          - target: powerpc-unknown-linux-gnu
-            toolchain: 1.41.0 # MSRV
-            use_cross: true
-            deps: true
-          - target: powerpc-unknown-linux-gnu
-            toolchain: stable
-            use_cross: true
-            deps: true
-          ## TODO: debug PPC64 linking errors. Example failure:
-          ## <https://github.com/RustCrypto/KDFs/runs/1276943457?check_suite_focus=true>
-          #- target: powerpc64-unknown-linux-gnu
-          #  toolchain: 1.41.0 # MSRV
-          #  use_cross: true
-          #  deps: true
-          #- target: powerpc64-unknown-linux-gnu
-          #  toolchain: stable
-          #  use_cross: true
-          #  deps: true
+        rust:
+          - 1.41.0 # MSRV
+          - stable
+        target:
+          - thumbv7em-none-eabi
+          - wasm32-unknown-unknown
     steps:
       - uses: actions/checkout@v1
-      - run: ${{ matrix.deps }}
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ matrix.toolchain }}
+          toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
           override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          use-cross: ${{ matrix.use_cross }}
-          args: --target ${{ matrix.target }} --release
-      - uses: actions-rs/cargo@v1
+      - run: cargo build --no-default-features --target ${{ matrix.target }}
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - 1.41.0 # MSRV
+          - stable
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
         with:
-          command: test
-          use-cross: ${{ matrix.use_cross }}
-          args: --target ${{ matrix.target }} --release --all-features
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+      - run: cargo check --all-features
+      - run: cargo test --no-default-features
+      - run: cargo test
+      - run: cargo test --all-features