Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.dockerignore
Dockerfile
.vagrant/
codecov/
codecov-results/
.dev/
.venv/
.git/
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,20 @@
if: ${{ !cancelled() }}
uses: codecov/test-results-action@v1
with:
files: ./codecov/junit.xml
files: ./codecov-results/junit.xml
flags: unittests
token: ${{ secrets.CODECOV_TOKEN }}

- name: Upload unit test coverage results to Codecov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5

Check warning

Code scanning / CodeQL

Unpinned tag for a non-immutable Action in workflow Medium

Unpinned 3rd party Action 'ci' step
Uses Step
uses 'codecov/codecov-action' with ref 'v5', not a pinned commit hash
if: ${{ !cancelled() }}
with:
files: ./codecov/unittests.xml
files: ./codecov-results/unittests.xml
flags: unittests
token: ${{ secrets.CODECOV_TOKEN }}

- name: Upload functional test coverage results to Codecov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5

Check warning

Code scanning / CodeQL

Unpinned tag for a non-immutable Action in workflow Medium

Unpinned 3rd party Action 'ci' step
Uses Step
uses 'codecov/codecov-action' with ref 'v5', not a pinned commit hash
if: ${{ !cancelled() }}
with:
files: ./codecov/functionaltests.xml
files: ./codecov-results/functionaltests.xml
flags: functionaltests
token: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ cache/
lib/
log/
.vagrant/
codecov/
codecov-results/
.dev/
test_logs/
6 changes: 3 additions & 3 deletions docker/_cms-test-internal.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/usr/bin/env bash

sudo chown cmsuser:cmsuser ./codecov
sudo chown cmsuser:cmsuser ./codecov-results

dropdb --if-exists --host=testdb --username=postgres cmsdbfortesting
createdb --host=testdb --username=postgres cmsdbfortesting
cmsInitDB

pytest --cov . --cov-report xml:codecov/unittests.xml --junitxml=codecov/junit.xml -o junit_family=legacy
pytest --cov . --cov-report xml:codecov-results/unittests.xml --junitxml=codecov-results/junit.xml -o junit_family=legacy
UNIT=$?

dropdb --host=testdb --username=postgres cmsdbfortesting
createdb --host=testdb --username=postgres cmsdbfortesting
cmsInitDB

cmsRunFunctionalTests -v --coverage codecov/functionaltests.xml
cmsRunFunctionalTests -v --coverage codecov-results/functionaltests.xml
FUNC=$?

# This check is needed because otherwise failing unit tests aren't reported in
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
# - https://github.com/actions/runner/issues/241
PYTEST_ADDOPTS: --color=yes
volumes:
- "../codecov:/home/cmsuser/src/codecov"
- "../codecov-results:/home/cmsuser/src/codecov-results"
privileged: true
cgroup: host
command: wait-for-it testdb:5432 -- docker/_cms-test-internal.sh
Expand Down