Manual merge resolution

1 files changed, 32 insertions, 14 deletions

diff --git a/.github/workflows/pcb-tools.yml b/.github/workflows/pcb-tools.yml
index 85038a7..59abe6c 100644
--- a/.github/workflows/pcb-tools.yml
+++ b/.github/workflows/pcb-tools.yml
@@ -1,6 +1,6 @@
 name: pcb-tools
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   test:
@@ -11,16 +11,34 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements-dev.txt
-    - name: Test with pytest
-      run: |
-        pip install pytest
-        pytest
+      - uses: actions/checkout@v1
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          pip install -r requirements-dev.txt
+      - name: Test with pytest
+        run: |
+          pytest
+  coverage:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+      - name: Install dependencies
+        run: |
+          pip install -r requirements-dev.txt
+      - name: Run coverage
+        run: |
+          make test-coverage
+      - uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage.xml
+          flags: unittest