Use push action for codecov

As per codecov/codecov-bash#83 codecov has issues with github actions triggered by pullrequest. To remedy the situation, we use push as a trigger instead.
equinor · May 30, 2022 · 1e12cca · 1e12cca
1 parent d594604
commit 1e12cca
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
     - name: Build libres
       run: |
         mkdir cmake-build
-        cmake -S libres -B cmake-build -DBUILD_TESTS=ON -DCOVERAGE=ON
+        cmake -S libres -B cmake-build -DBUILD_TESTS=ON
         cmake --build cmake-build
 
     - name: Run tests
@@ -56,19 +56,6 @@ jobs:
         export PATH=$PWD/bin:$PATH
         ctest --output-on-failure
 
-    - name: Install gcovr
-      run: |
-        python3 -m pip install gcovr
-
-    - name: generate coverage report
-      run: |
-        gcovr -r libres/ --exclude-directories ".*tests" cmake-build/ --xml -o cov.xml
-
-    - name: Upload c coverage to Codecov
-      uses: codecov/codecov-action@v2
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        files: cov.xml
 
   build-wheels:
     timeout-minutes: 30

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -1,12 +1,10 @@
-name: Python coverage
+name: coverage
 
-on:
- push:
-   branches:
-     - main
-     - 'version-**'
-   tags: "*"
- pull_request:
+on: [push]
+
+env:
+  ERT_SHOW_BACKTRACE: 1
+  ECL_SKIP_SIGNAL: 1
 
 jobs:
   python-test-coverage:
@@ -15,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        system-under-test: ['res', 'ert']
+        system-under-test: ['res', 'ert', 'libres']
     steps:
     - uses: actions/checkout@v2
       with:
@@ -30,7 +28,9 @@ jobs:
       with:
         python-version: '3.9'
 
-    - name: Install with dependencies
+
+    - name: Install pip package with dependencies
+      if: matrix.system-under-test == 'ert' || matrix.system-under-test == 'res'
       run: |
         pip install .
         pip install -r dev-requirements.txt
@@ -54,7 +54,26 @@ jobs:
         cd tests
         pytest libres_tests --cov=res --cov-report=xml:cov.xml
 
-    - name: Upload python coverage to Codecov
+    - name: Run libres tests
+      if: matrix.system-under-test == 'libres'
+      run: |
+        sudo apt-get install -y valgrind
+        python3 -m pip install conan
+        git clone https://github.com/equinor/libecl
+        mkdir libecl/build
+        cmake -S libecl -B libecl/build -DCMAKE_BUILD_TYPE=RelWithDebInfo
+        sudo cmake --build libecl/build --target install
+        sudo rm -rf libecl
+        mkdir cmake-build
+        cmake -S libres -B cmake-build -DBUILD_TESTS=ON -DCOVERAGE=ON
+        cmake --build cmake-build
+        cd cmake-build
+        export PATH=$PWD/bin:$PATH
+        ctest --output-on-failure
+        python3 -m pip install gcovr
+        gcovr -r libres/ --exclude-directories ".*tests" cmake-build/ --xml -o tests/cov.xml
+
+    - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v2
       with:
         token: ${{ secrets.CODECOV_TOKEN }}