Merge branch 'main' into postgres-17

jtschladen · Feb 12, 2025 · a28d8a9 · a28d8a9
2 parents 50f849e + 5810736
commit a28d8a9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -84,21 +84,20 @@ jobs:
           source ~/env/bin/activate
           bandit -r . -ll -ii -x lemur/tests/,docs
           xvfb-run make test-js
-  # todo: re-enable me once https://github.com/coverallsapp/github-action/issues/205 is resolved
-  #     - name: Coveralls GitHub Action
-  #       uses: coverallsapp/github-action@v2
-  #       with:
-  #         parallel: true
-  #         flag-name: Python ${{ matrix.python-version }} Postgres ${{ matrix.postgres-version }} OS ${{ matrix.os }}
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  # coveralls:
-  #     name: Indicate completion to coveralls.io
-  #     needs: build
-  #     if: ${{ always() }}
-  #     runs-on: ubuntu-latest
-  #     steps:
-  #     - name: Coveralls Finished
-  #       uses: coverallsapp/github-action@v2
-  #       with:
-  #         parallel-finished: true
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/github-action@v2
+        with:
+          parallel: true
+          flag-name: Python ${{ matrix.python-version }} Postgres ${{ matrix.postgres-version }} OS ${{ matrix.os }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  coveralls:
+      name: Indicate completion to coveralls.io
+      needs: build
+      if: ${{ always() }}
+      runs-on: ubuntu-latest
+      steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@v2
+        with:
+          parallel-finished: true
diff --git a/Makefile b/Makefile
@@ -87,6 +87,7 @@ test-js:
 test-python:
 	@echo "--> Running Python tests"
 	coverage run --source lemur -m pytest
+	coverage xml
 	@echo ""
 
 lint: lint-python lint-js