Move coverage report preparation for docker-based CI back into entryp…

…oint shell script
hasgeek · Jun 27, 2023 · a5575d4 · a5575d4
1 parent 04a7922
commit a5575d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/pytest-docker.yml b/.github/workflows/pytest-docker.yml
@@ -48,8 +48,6 @@ jobs:
         run: docker compose -f docker-compose.ci.yml run -u root --entrypoint "" --no-deps --quiet-pull main chown -R 1000:1000 coverage
       - name: Test with pytest
         run: docker compose -f docker-compose.ci.yml up --quiet-pull --no-attach db --no-attach redis --no-log-prefix --exit-code-from main
-      - name: Prepare coverage report
-        run: docker compose -f docker-compose.ci.yml run --entrypoint "" main coverage lcov -o coverage/funnel.lcov
       - name: Upload coverage report to Coveralls
         uses: coverallsapp/github-action@master
         with:

diff --git a/docker/entrypoints/ci.sh b/docker/entrypoints/ci.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-GITHUB_ACTIONS=true pytest \
+pytest \
     --allow-hosts=127.0.0.1,::1,$(hostname -i),$(getent ahosts $DB_HOST | awk '/STREAM/ { print $1}'),$(getent ahosts $REDIS_HOST | awk '/STREAM/ { print $1}') \
     --gherkin-terminal-reporter -vv --showlocals --cov=funnel $@
+coverage lcov -o coverage/funnel.lcov