From efc911a229a1c2fd61438b14166e7f6894f70ae9 Mon Sep 17 00:00:00 2001 From: Michael C Date: Sat, 18 Feb 2023 00:21:58 -0500 Subject: [PATCH 1/2] fix codecov --- .github/workflows/codecov.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml index 90488a1..0e31ca4 100644 --- a/.github/workflows/codecov.yaml +++ b/.github/workflows/codecov.yaml @@ -12,5 +12,12 @@ jobs: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 18 + - run: npm ci + - name: Generate coverage reports + run: npx nyc --reporter=lcov npm test - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 From 4a90ba8992682f300b97e8d2e4b96386436bbe32 Mon Sep 17 00:00:00 2001 From: Michael C Date: Sat, 18 Feb 2023 00:36:45 -0500 Subject: [PATCH 2/2] run sqlite and postgres coverage --- .github/workflows/codecov.yaml | 14 +++++++++++++- .github/workflows/postgres-redis-ci.yml | 4 +--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml index 0e31ca4..db6e99e 100644 --- a/.github/workflows/codecov.yaml +++ b/.github/workflows/codecov.yaml @@ -13,11 +13,23 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Build the docker-compose stack + env: + PG_USER: ci_db_user + PG_PASS: ci_db_pass + run: docker-compose -f docker/docker-compose-ci.yml up -d + - name: Check running containers + run: docker ps - uses: actions/setup-node@v3 with: node-version: 18 - run: npm ci - - name: Generate coverage reports + - name: Generate sqlite coverage reports + run: npx nyc --reporter=lcov npm test + - name: Generate postgres coverage reports + env: + TEST_POSTGRES: true + timeout-minutes: 5 run: npx nyc --reporter=lcov npm test - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 diff --git a/.github/workflows/postgres-redis-ci.yml b/.github/workflows/postgres-redis-ci.yml index 6963ab5..3003686 100644 --- a/.github/workflows/postgres-redis-ci.yml +++ b/.github/workflows/postgres-redis-ci.yml @@ -28,6 +28,4 @@ jobs: env: TEST_POSTGRES: true timeout-minutes: 5 - run: npx nyc --silent npm test - - name: Generate coverage report - run: npm run cover:report \ No newline at end of file + run: npx nyc --silent npm test \ No newline at end of file