Snap for 10453563 from c7a291994efff0716ff725cb4ab0bf56f38ea0e0 to mainline-conscrypt-releaseaml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000android14-mainline-conscrypt-release

Change-Id: Id4f7439194792cf663c6157ec1812ce7625217b6

1 files changed, 35 insertions, 3 deletions

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2c39904..d7f39e4 100755
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -5,6 +5,7 @@ on:
   pull_request:
     branches:
       - master
+      - version-0.4
 
 name: tests
 
@@ -16,13 +17,13 @@ jobs:
         rust:
           - stable
           - beta
-          - nightly
-          - 1.46.0  # MSRV
+          - 1.57  # MSRV
 
     steps:
       - uses: actions/checkout@v2
 
       - uses: actions-rs/toolchain@v1
+        name: Setup rust toolchain
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
@@ -30,25 +31,56 @@ jobs:
           components: rustfmt, clippy
 
       - uses: Swatinem/rust-cache@v1
+        name: Load dependencies from cache
 
       - uses: actions-rs/cargo@v1
+        name: Build with stable features
         with:
           command: build
           args: --features stable
 
       - uses: actions-rs/cargo@v1
+        if: ${{ matrix.rust == 'nightly' }}
+        name: Build with unstable features
+        with:
+          command: build
+          args: --all-features
+
+      - uses: actions-rs/cargo@v1
+        name: Build with minimal features
+        with:
+          command: build
+          args: --no-default-features
+
+      - uses: actions-rs/cargo@v1
+        name: Test with stable features
         with:
           command: test
           args: --features stable
 
       - uses: actions-rs/cargo@v1
+        name: Test with minimal features
+        with:
+          command: test
+          args: --no-default-features
+
+      - uses: actions-rs/cargo@v1
+        name: Check for non-standard formatting
         if: ${{ matrix.rust == 'stable' }}
         with:
           command: fmt
           args: --all -- --check
 
       - uses: actions-rs/cargo@v1
-        if: ${{ matrix.rust != '1.40.0' }} # 1.40 has horrible lints.
+        name: Check for clippy hints
         with:
           command: clippy
           args: -- -D warnings
+
+      - name: Test run targeting WASI
+        run: |
+          curl https://wasmtime.dev/install.sh -sSf | bash
+          source ~/.bashrc
+          export PATH=$HOME/.wasmtime/bin/:$PATH
+          cargo install cargo-wasi
+          cargo wasi bench --no-default-features -- --test