From ec2510a35be08c7619110df78bc283f95da5e6e4 Mon Sep 17 00:00:00 2001 From: januszjanus Date: Thu, 10 Oct 2024 14:39:45 +0200 Subject: [PATCH 01/15] add coverage upload --- .github/workflows/generate-allure-report.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index 3f221453e77..dc3667122d2 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -59,6 +59,15 @@ jobs: if-no-files-found: error retention-days: 1 + - name: Collect and upload test coverage + uses: actions/upload-artifact@v4 + if: always() + with: + name: coverage-reports + path: "**/*${{ env.COVERAGE_EXT }}" + if-no-files-found: error + retention-days: 1 + generate-allure-report: name: Generate allure report runs-on: ubuntu-latest From 853b3f8f8592096950446d885a46855fc5b11cfb Mon Sep 17 00:00:00 2001 From: januszjanus Date: Thu, 10 Oct 2024 14:47:46 +0200 Subject: [PATCH 02/15] add coverage report saving --- rust/Earthfile | 1 + 1 file changed, 1 insertion(+) diff --git a/rust/Earthfile b/rust/Earthfile index 2ba01a634c6..f4524245ac9 100644 --- a/rust/Earthfile +++ b/rust/Earthfile @@ -57,6 +57,7 @@ build: --args4="--bins=cbork/cbork" \ --output="release/[^\./]+" \ --junit="cat-libs.junit-report.xml" \ + --coverage="cat-libs.coverage.info" \ --docs="true" SAVE ARTIFACT target/$TARGETARCH/doc doc From c85e4f53853f3fa4da26a0c049205d3d3ff2065c Mon Sep 17 00:00:00 2001 From: januszjanus Date: Thu, 10 Oct 2024 14:54:56 +0200 Subject: [PATCH 03/15] add coverage report saving take 2 --- rust/Earthfile | 1 + 1 file changed, 1 insertion(+) diff --git a/rust/Earthfile b/rust/Earthfile index f4524245ac9..e7911ea50d0 100644 --- a/rust/Earthfile +++ b/rust/Earthfile @@ -55,6 +55,7 @@ build: --args2="--libs=cbork-cddl-parser --libs=cbork-abnf-parser" \ --args3="--libs=catalyst-voting" \ --args4="--bins=cbork/cbork" \ + --args5="--cov_report=$HOME/build/coverage-report.info" \ --output="release/[^\./]+" \ --junit="cat-libs.junit-report.xml" \ --coverage="cat-libs.coverage.info" \ From 08bee9817ab95c505092d78ab6d739396483bab8 Mon Sep 17 00:00:00 2001 From: januszjanus Date: Thu, 10 Oct 2024 15:24:10 +0200 Subject: [PATCH 04/15] add coverage report saving take 3 --- .github/workflows/generate-allure-report.yml | 47 ++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index dc3667122d2..fd40eafe6f3 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -115,3 +115,50 @@ jobs: ${{ steps.allure.outputs.test_result_icon }} [Test Report](${{ steps.allure.outputs.report_url }}) | ${\color{lightgreen}Pass: ${{ steps.allure.outputs.test_result_passed }}/${{ steps.allure.outputs.test_result_total }}}$ | ${\color{red}Fail: ${{ steps.allure.outputs.test_result_failed }}/${{ steps.allure.outputs.test_result_total }}}$ | comment_tag: allure_report mode: upsert + + generate-coverage-report: + name: Generate coverage report + runs-on: ubuntu-latest + needs: [generate-test-reports] + steps: + - uses: actions/checkout@v4 + + - uses: actions/download-artifact@v4 + with: + name: coverage-reports + + - name: Collect coverage report + run: | + mkdir -p ${{ env.COVERAGE_REPORT_PATH }} + shopt -s globstar + cp **/*${{ env.COVERAGE_EXT }} ${{ env.COVERAGE_REPORT_PATH }} + ls ${{ env.COVERAGE_REPORT_PATH }} + + - name: Normalize coverage report paths + run: | + sed -i -e 's/SF:\/root/SF:rust/g' ${{ env.COVERAGE_REPORT_PATH }}/cat-libs.coverage.info + # sed -i -e 's/SF:/SF:rust\/tests\/api_tests\//g' ${{ env.COVERAGE_REPORT_PATH }}/api-tests.coverage.info + + - name: Coveralls + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: coverallsapp/github-action@v2 + with: + path-to-lcov: "${{ env.COVERAGE_REPORT_PATH }}/cat-libs.coverage.info" + allow-empty: true + debug: true + flag-name: rust-unit-test + base-path: "/home/runner/work/catalyst-libs/" + parallel: true + + upload-coverage-report: + name: Upload coverage report + needs: [generate-coverage-report] + if: ${{ always() }} + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: coverallsapp/github-action@v2 + with: + parallel-finished: true + carryforward: "rust-unit-test" From ee29d2b816fd1374ed178f0c1b8f605bdb0bdf51 Mon Sep 17 00:00:00 2001 From: januszjanus Date: Fri, 11 Oct 2024 08:11:31 +0200 Subject: [PATCH 05/15] debug --- .github/workflows/generate-allure-report.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index fd40eafe6f3..c2f8bf5c265 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -127,6 +127,8 @@ jobs: with: name: coverage-reports + - name: Setup upterm session + uses: lhotari/action-upterm@v1 - name: Collect coverage report run: | mkdir -p ${{ env.COVERAGE_REPORT_PATH }} @@ -137,7 +139,6 @@ jobs: - name: Normalize coverage report paths run: | sed -i -e 's/SF:\/root/SF:rust/g' ${{ env.COVERAGE_REPORT_PATH }}/cat-libs.coverage.info - # sed -i -e 's/SF:/SF:rust\/tests\/api_tests\//g' ${{ env.COVERAGE_REPORT_PATH }}/api-tests.coverage.info - name: Coveralls env: From 7a51874f6a3ae4b9b3d5667927d3a199c0a6b141 Mon Sep 17 00:00:00 2001 From: januszjanus Date: Fri, 11 Oct 2024 08:38:39 +0200 Subject: [PATCH 06/15] add coverage report saving take 4 --- .github/workflows/generate-allure-report.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index c2f8bf5c265..3523794c8f2 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -127,8 +127,6 @@ jobs: with: name: coverage-reports - - name: Setup upterm session - uses: lhotari/action-upterm@v1 - name: Collect coverage report run: | mkdir -p ${{ env.COVERAGE_REPORT_PATH }} @@ -149,7 +147,7 @@ jobs: allow-empty: true debug: true flag-name: rust-unit-test - base-path: "/home/runner/work/catalyst-libs/" + base-path: "/home/runner/work/catalyst-libs/catalyst-libs/" parallel: true upload-coverage-report: From 6cb54d1c5abe5e2a89438e0836ba0f26654ce9e4 Mon Sep 17 00:00:00 2001 From: januszjanus Date: Fri, 11 Oct 2024 08:42:35 +0200 Subject: [PATCH 07/15] debug --- .github/workflows/generate-allure-report.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index 3523794c8f2..e12ea933f8b 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -150,6 +150,9 @@ jobs: base-path: "/home/runner/work/catalyst-libs/catalyst-libs/" parallel: true + - name: Setup upterm session + uses: lhotari/action-upterm@v1 + upload-coverage-report: name: Upload coverage report needs: [generate-coverage-report] From c08673dd5d980bb4b17f7a0dfe856f8384df551b Mon Sep 17 00:00:00 2001 From: januszjanus Date: Fri, 11 Oct 2024 11:44:22 +0200 Subject: [PATCH 08/15] add coverage report saving take 5 --- .github/workflows/generate-allure-report.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index e12ea933f8b..3523794c8f2 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -150,9 +150,6 @@ jobs: base-path: "/home/runner/work/catalyst-libs/catalyst-libs/" parallel: true - - name: Setup upterm session - uses: lhotari/action-upterm@v1 - upload-coverage-report: name: Upload coverage report needs: [generate-coverage-report] From 0c3c24135fcfcb8b63d8ac9ed3e2d916df63acf3 Mon Sep 17 00:00:00 2001 From: januszjanus Date: Fri, 11 Oct 2024 11:56:19 +0200 Subject: [PATCH 09/15] add coverage report saving take 6 --- .github/workflows/generate-allure-report.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index 3523794c8f2..5fd7321435a 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -147,9 +147,12 @@ jobs: allow-empty: true debug: true flag-name: rust-unit-test - base-path: "/home/runner/work/catalyst-libs/catalyst-libs/" + base-path: "/home/runner/work/catalyst-libs/" parallel: true + - name: Setup upterm session + uses: lhotari/action-upterm@v1 + upload-coverage-report: name: Upload coverage report needs: [generate-coverage-report] From 76d667c03aa138b230c83877f58cca18cd8b765d Mon Sep 17 00:00:00 2001 From: januszjanus Date: Fri, 11 Oct 2024 12:00:35 +0200 Subject: [PATCH 10/15] add coverage report saving take 7 --- .github/workflows/generate-allure-report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index 5fd7321435a..e12ea933f8b 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -147,7 +147,7 @@ jobs: allow-empty: true debug: true flag-name: rust-unit-test - base-path: "/home/runner/work/catalyst-libs/" + base-path: "/home/runner/work/catalyst-libs/catalyst-libs/" parallel: true - name: Setup upterm session From 2259a89919b21e0ccfe4be86753135faaa16d553 Mon Sep 17 00:00:00 2001 From: januszjanus Date: Fri, 11 Oct 2024 12:05:51 +0200 Subject: [PATCH 11/15] debug --- .github/workflows/generate-allure-report.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index e12ea933f8b..849ddcf28e7 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -134,10 +134,16 @@ jobs: cp **/*${{ env.COVERAGE_EXT }} ${{ env.COVERAGE_REPORT_PATH }} ls ${{ env.COVERAGE_REPORT_PATH }} + - name: Setup upterm session + uses: lhotari/action-upterm@v1 + - name: Normalize coverage report paths run: | sed -i -e 's/SF:\/root/SF:rust/g' ${{ env.COVERAGE_REPORT_PATH }}/cat-libs.coverage.info + - name: Setup upterm session + uses: lhotari/action-upterm@v1 + - name: Coveralls env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -150,9 +156,6 @@ jobs: base-path: "/home/runner/work/catalyst-libs/catalyst-libs/" parallel: true - - name: Setup upterm session - uses: lhotari/action-upterm@v1 - upload-coverage-report: name: Upload coverage report needs: [generate-coverage-report] From 395a244f771cfbf3f3518824246ee6ffd3b29136 Mon Sep 17 00:00:00 2001 From: januszjanus Date: Fri, 11 Oct 2024 12:19:15 +0200 Subject: [PATCH 12/15] add coverage report saving take 8 --- .github/workflows/generate-allure-report.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index 849ddcf28e7..356d7d5e25d 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -134,12 +134,9 @@ jobs: cp **/*${{ env.COVERAGE_EXT }} ${{ env.COVERAGE_REPORT_PATH }} ls ${{ env.COVERAGE_REPORT_PATH }} - - name: Setup upterm session - uses: lhotari/action-upterm@v1 - - name: Normalize coverage report paths run: | - sed -i -e 's/SF:\/root/SF:rust/g' ${{ env.COVERAGE_REPORT_PATH }}/cat-libs.coverage.info + sed -i -e 's/SF:\/root/SF:build/g' ${{ env.COVERAGE_REPORT_PATH }}/cat-libs.coverage.info - name: Setup upterm session uses: lhotari/action-upterm@v1 From 5dafc55be3120d7264d3d05609dfb7bca28e4a83 Mon Sep 17 00:00:00 2001 From: januszjanus Date: Fri, 11 Oct 2024 12:26:01 +0200 Subject: [PATCH 13/15] add coverage report saving take 9 --- .github/workflows/generate-allure-report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index 356d7d5e25d..7f1b1ba0c7d 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -136,7 +136,7 @@ jobs: - name: Normalize coverage report paths run: | - sed -i -e 's/SF:\/root/SF:build/g' ${{ env.COVERAGE_REPORT_PATH }}/cat-libs.coverage.info + sed -i -e 's/SF:\/root\/build/SF:rust/g' ${{ env.COVERAGE_REPORT_PATH }}/cat-libs.coverage.info - name: Setup upterm session uses: lhotari/action-upterm@v1 From 3191d5ae33a22137f4e862100a8488490c61c100 Mon Sep 17 00:00:00 2001 From: januszjanus Date: Fri, 11 Oct 2024 12:30:08 +0200 Subject: [PATCH 14/15] cleanup --- .github/workflows/generate-allure-report.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml index 7f1b1ba0c7d..529b2df8a69 100644 --- a/.github/workflows/generate-allure-report.yml +++ b/.github/workflows/generate-allure-report.yml @@ -138,9 +138,6 @@ jobs: run: | sed -i -e 's/SF:\/root\/build/SF:rust/g' ${{ env.COVERAGE_REPORT_PATH }}/cat-libs.coverage.info - - name: Setup upterm session - uses: lhotari/action-upterm@v1 - - name: Coveralls env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9db4be6b2f5b5c1c4ce9622def42778957ebfba6 Mon Sep 17 00:00:00 2001 From: januszjanus Date: Fri, 11 Oct 2024 12:50:10 +0200 Subject: [PATCH 15/15] add new dict words --- .config/dictionaries/project.dic | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/dictionaries/project.dic b/.config/dictionaries/project.dic index 71af2719143..9580278cffa 100644 --- a/.config/dictionaries/project.dic +++ b/.config/dictionaries/project.dic @@ -24,6 +24,7 @@ bootstrapper BROTLI cantopen cardano +carryforward CBOR cbork cdylib @@ -39,6 +40,7 @@ ciphertexts codegen codepoints coti +coverallsapp cpus crontabs crontagged