From 9b69ef44b14e7c591a3e543ae45b6cef0d3b561e Mon Sep 17 00:00:00 2001 From: Alexandru Placinta Date: Tue, 14 Nov 2023 14:14:35 +0100 Subject: [PATCH] Enrich tests --- .github/workflows/check.yml | 2 +- .github/workflows/test_components_input.yml | 30 ++++++++++++++---- .../test_install_stable_nightly_beta.yml | 4 ++- .github/workflows/test_override_input.yml | 11 ++++--- .github/workflows/test_targets_input.yml | 31 +++++++++++-------- .github/workflows/test_toolchain_input.yml | 1 - ...t_input.yml => test_toolchain_version.yml} | 5 +-- .github/workflows/unit_tests.yml | 4 +-- 8 files changed, 57 insertions(+), 31 deletions(-) rename .github/workflows/{test_default_input.yml => test_toolchain_version.yml} (95%) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index dd97469c..20cb4867 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -1,4 +1,4 @@ -name: Check +name: Lint check on: push: branches: diff --git a/.github/workflows/test_components_input.yml b/.github/workflows/test_components_input.yml index 8a917269..18bfb19f 100644 --- a/.github/workflows/test_components_input.yml +++ b/.github/workflows/test_components_input.yml @@ -18,6 +18,7 @@ concurrency: cancel-in-progress: true jobs: install_on_runner: + name: Components (runner) runs-on: ${{ matrix.os }} strategy: matrix: @@ -25,6 +26,11 @@ jobs: - ubuntu-latest - macOS-latest - windows-latest + # Test with multiple spacing + components: + - clippy, miri, llvm-tools-preview + - clippy,miri,llvm-tools-preview + - clippy,miri, llvm-tools-preview steps: - name: Checkout uses: actions/checkout@v4 @@ -35,15 +41,21 @@ jobs: toolchain: nightly profile: minimal override: true - # 2 components not included within the minimal profile - components: clippy, miri + components: "${{ matrix.components }}" - name: Test clippy exists - run: cargo clippy -V + run: | + test $(rustup component list | grep clippy | wc -l) -eq 1 - name: Test miri exists - run: cargo miri -V + run: | + test $(rustup component list | grep clippy | wc -l) -eq 1 + + - name: Test llvm exists + run: | + test $(rustup component list | grep llvm | wc -l) -eq 1 install_in_docker: + name: Components (docker) runs-on: ubuntu-latest # Docker image, not the GitHub Actions VM container: ubuntu:latest @@ -65,7 +77,13 @@ jobs: components: clippy, miri - name: Test clippy exists - run: cargo clippy -V + run: | + test $(rustup component list | grep clippy | wc -l) -eq 1 - name: Test miri exists - run: cargo miri -V + run: | + test $(rustup component list | grep clippy | wc -l) -eq 1 + + - name: Test llvm exists + run: | + test $(rustup component list | grep llvm | wc -l) -eq 1 diff --git a/.github/workflows/test_install_stable_nightly_beta.yml b/.github/workflows/test_install_stable_nightly_beta.yml index 413ac853..633cbf4a 100644 --- a/.github/workflows/test_install_stable_nightly_beta.yml +++ b/.github/workflows/test_install_stable_nightly_beta.yml @@ -1,4 +1,4 @@ -name: CI Test - install stable, nightly, and beta +name: CI Test - install toolchain stable, nightly, and beta on: push: branches: @@ -18,6 +18,7 @@ concurrency: cancel-in-progress: true jobs: install_on_runner: + name: Toolchain stable, nightly, and beta (runner) runs-on: ${{ matrix.os }} strategy: matrix: @@ -53,6 +54,7 @@ jobs: echo "$CARGO" && test "$CARGO" != "" echo "$RUSTUP" && test "$RUSTUP" != "" install_in_docker: + name: Toolchain stable, nightly, and beta (docker) runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/test_override_input.yml b/.github/workflows/test_override_input.yml index 69ff6da6..616f3c56 100644 --- a/.github/workflows/test_override_input.yml +++ b/.github/workflows/test_override_input.yml @@ -18,6 +18,7 @@ concurrency: cancel-in-progress: true jobs: install_on_runner: + name: Override (runner) runs-on: ${{ matrix.os }} strategy: matrix: @@ -39,11 +40,11 @@ jobs: profile: minimal override: true - - name: Test toolchain version + - name: Test override run: | - test "${{ steps.toolchain.outputs.rustc }}" = "${{ matrix.toolchain }}" - + test $(rustup override list | grep "${{ matrix.toolchain }}" | wc -l) -eq 1 install_in_docker: + name: Override (docker) runs-on: ubuntu-latest strategy: matrix: @@ -67,6 +68,6 @@ jobs: profile: minimal override: true - - name: Test toolchain version + - name: Test override run: | - test "${{ steps.toolchain.outputs.rustc }}" = "${{ matrix.toolchain }}" + test $(rustup override list | grep "${{ matrix.toolchain }}" | wc -l) -eq 1 diff --git a/.github/workflows/test_targets_input.yml b/.github/workflows/test_targets_input.yml index 57716c27..42844d79 100644 --- a/.github/workflows/test_targets_input.yml +++ b/.github/workflows/test_targets_input.yml @@ -18,6 +18,7 @@ concurrency: cancel-in-progress: true jobs: install_on_runner: + name: Targets (runner) runs-on: ${{ matrix.os }} strategy: matrix: @@ -25,9 +26,11 @@ jobs: - ubuntu-latest - macOS-latest - windows-latest - # These are 2 more exotic targets that are not found on the runners - target: - - wasm32-unknown-unknown, arm-linux-androideabi + # Test with multiple spacing + targets: + - wasm32-unknown-unknown, arm-linux-androideabi, i686-pc-windows-msvc + - wasm32-unknown-unknown,arm-linux-androideabi,i686-pc-windows-msvc + - wasm32-unknown-unknown,arm-linux-androideabi, i686-pc-windows-msvc steps: - name: Checkout uses: actions/checkout@v4 @@ -38,20 +41,22 @@ jobs: toolchain: nightly profile: minimal override: true - targets: ${{ matrix.target }} + targets: ${{ matrix.targets }} - name: Test ${{ matrix.target }} exists - # We check for 3 as we expect the target for the current runner + 2 + # We check for 4 as we expect the target for the current runner + 3 # from the target from the matrix - run: test $(rustup target list | grep -c installed) -eq 3 - + run: test $(rustup target list | grep -c installed) -eq 4 install_in_docker: + name: Targets (docker) runs-on: ubuntu-latest strategy: matrix: - # These are 2 more exotic targets that are not found on the runners - target: - - wasm32-unknown-unknown, arm-linux-androideabi + # Test with multiple spacing + targets: + - wasm32-unknown-unknown, arm-linux-androideabi, i686-pc-windows-msvc + - wasm32-unknown-unknown,arm-linux-androideabi,i686-pc-windows-msvc + - wasm32-unknown-unknown,arm-linux-androideabi, i686-pc-windows-msvc # Docker image, not the GitHub Actions VM container: ubuntu:latest steps: @@ -68,9 +73,9 @@ jobs: toolchain: nightly profile: minimal override: true - targets: ${{ matrix.target }} + targets: ${{ matrix.targets }} - name: Test ${{ matrix.target }} exists - # We check for 3 as we expect the target for the current runner + 2 + # We check for 4 as we expect the target for the current runner + 3 # from the target from the matrix - run: test $(rustup target list | grep -c installed) -eq 3 + run: test $(rustup target list | grep -c installed) -eq 4 diff --git a/.github/workflows/test_toolchain_input.yml b/.github/workflows/test_toolchain_input.yml index d9bb0551..4bddaecb 100644 --- a/.github/workflows/test_toolchain_input.yml +++ b/.github/workflows/test_toolchain_input.yml @@ -42,7 +42,6 @@ jobs: - name: Test toolchain version run: | test "${{ steps.toolchain.outputs.rustc }}" = "${{ matrix.toolchain }}" - install_in_docker: runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/test_default_input.yml b/.github/workflows/test_toolchain_version.yml similarity index 95% rename from .github/workflows/test_default_input.yml rename to .github/workflows/test_toolchain_version.yml index e34b5913..9fa5d263 100644 --- a/.github/workflows/test_default_input.yml +++ b/.github/workflows/test_toolchain_version.yml @@ -1,4 +1,4 @@ -name: CI Test - default input +name: CI Test - toolchain input on: push: branches: @@ -18,6 +18,7 @@ concurrency: cancel-in-progress: true jobs: install_on_runner: + name: Toolchain (runner) runs-on: ${{ matrix.os }} strategy: matrix: @@ -42,8 +43,8 @@ jobs: - name: Test toolchain version run: | test "${{ steps.toolchain.outputs.rustc }}" = "${{ matrix.toolchain }}" - install_in_docker: + name: Toolchain (docker) runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 7a42837a..8c4b2a29 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -1,4 +1,4 @@ -name: Unit Tests +name: Unit tests on: push: branches: @@ -18,8 +18,8 @@ concurrency: cancel-in-progress: true jobs: test: + name: Units tests runs-on: ubuntu-latest - name: Test steps: - name: Checkout uses: actions/checkout@v4