From a7ef90cce6389bad19c1c290b766675c4d9f572f Mon Sep 17 00:00:00 2001
From: Noortheen Raja <jnoortheen@gmail.com>
Date: Fri, 18 Mar 2022 11:53:40 +0530
Subject: [PATCH] fix: upload coverage for latest py version

fix: checking qa without amalgamation

fix: correct if expression

chore: update condition

chore: disable fail-fast

chore: update name
---
 .github/workflows/test.yml | 17 ++++++++++++-----
 pyproject.toml             |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1e9e3bfe8..7af28cca0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: pytest linux 3.8
+name: CI Tests
 
 on:
   push:
@@ -12,10 +12,10 @@ jobs:
   ci:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
         python-version: ["3.7", "3.8", "3.9","3.10" ]
-        fail-fast: false
     name: Test Python ${{ matrix.python-version }} ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -29,9 +29,16 @@ jobs:
         run: |
           python -m pip --version
           python -m pip install -r requirements/tests.txt
-          python -m pip install . --no-deps
       - name: Run QA Checks
+        if: ${{ startsWith(matrix.os, 'ubuntu') && startsWith(matrix.python-version, '3.10') }}
         run: python -m xonsh run-tests.xsh qa
-        if: ${{ matrix.os == 'ubuntu-latest' }} && ${{ matrix.python-version == '3.10' }}
       - name: Run tests
-        run: python -m xonsh run-tests.xsh test -- --timeout=240
+        if: ${{ !startsWith(matrix.python-version, '3.10') }}
+        run: |
+          python -m pip install . --no-deps
+          python -m xonsh run-tests.xsh test -- --timeout=240
+      - name: Run tests with coverage
+        if: ${{ startsWith(matrix.python-version, '3.10') }}
+        run: |
+          python -m pip install -e . --no-deps
+          python -m xonsh run-tests.xsh test --report-coverage --no-amalgam -- --timeout=240
diff --git a/pyproject.toml b/pyproject.toml
index 64ef78813..b98ddd61d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,6 +40,6 @@ force_exclude = '''.*/__amalgam__.py'''
 
 [tool.isort]
 profile = "black"
-extend_skip_glob = ["xonsh/*_table.py", "xonsh/ply/**.py"]
+extend_skip_glob = ["xonsh/*_table.py", "xonsh/ply/**.py", "*/__amalgam__.py", "**/__amalgam__.py"]
 src_paths = ["xonsh", "xontrib", "xompletions", "tests"]
 known_third_party = ["ply"]