From a1ad7a3aef2d6b7ffd9e745a60c72b6cc99464d2 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 12:38:11 +0200 Subject: [PATCH 01/38] add dependabot yaml file --- .github/dependabot.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/dependabot.yaml diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 00000000..39bd9ac1 --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,7 @@ +version: 2 +enable-beta-ecosystems: true +updates: + - package-ecosystem: "pub" + directory: "/" + schedule: + interval: "weekly" \ No newline at end of file From 088b0b3113393c24f97d9c033befa3cae2c650ba Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 13:01:01 +0200 Subject: [PATCH 02/38] add workflow for tests --- .github/workflows/tests.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/tests.yaml diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml new file mode 100644 index 00000000..f47f4a5a --- /dev/null +++ b/.github/workflows/tests.yaml @@ -0,0 +1,30 @@ +name: Build and Test + +on: + push: + branches: + - "*" + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Set up Repository + uses: actions/checkout@v2 + + - name: Set up Dart + run: dart-lang/setup-dart@v3 + + + - name: Install dependencies + run: dart pub get + + - name: Check format + run: dart format --set-exit-if-changed . + + - name: Analyze + run: dart analyze . + + - name: Run tests + run: melos run test From 9629acb19fa41732ae98276bd8026cf5d112954a Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 13:02:01 +0200 Subject: [PATCH 03/38] update version of dart --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index f47f4a5a..c9b4710c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v2 - name: Set up Dart - run: dart-lang/setup-dart@v3 + run: dart-lang/setup-dart@v1 - name: Install dependencies From 9eb5e2b1aada1ed3b47e35adb5b87d3db35762c4 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 13:27:20 +0200 Subject: [PATCH 04/38] fix dart version --- .github/workflows/tests.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index c9b4710c..226e980f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -13,8 +13,11 @@ jobs: - name: Set up Repository uses: actions/checkout@v2 - - name: Set up Dart - run: dart-lang/setup-dart@v1 + - name: Setup Dart SDK + uses: dart-lang/setup-dart@v1.6.0 + + with: + sdk: 'stable' - name: Install dependencies From c4659bba5aa01b170a003b4d6d3773b6427285d1 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 13:29:16 +0200 Subject: [PATCH 05/38] remove format checking --- .github/workflows/tests.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 226e980f..256d70ff 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -23,11 +23,9 @@ jobs: - name: Install dependencies run: dart pub get - - name: Check format - run: dart format --set-exit-if-changed . - name: Analyze - run: dart analyze . + run: melos run analyze - name: Run tests run: melos run test From 85167dff0608ee263e30961044c5cc66b1a56781 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 13:32:20 +0200 Subject: [PATCH 06/38] add melos --- .github/workflows/tests.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 256d70ff..19e27ff7 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -15,15 +15,14 @@ jobs: - name: Setup Dart SDK uses: dart-lang/setup-dart@v1.6.0 - with: sdk: 'stable' + - name: Install Melos + run: dart pub global activate melos - - name: Install dependencies run: dart pub get - - name: Analyze run: melos run analyze From 08128ddd8206c85dc104fb060554f69faa1f694d Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 13:34:59 +0200 Subject: [PATCH 07/38] add analyze --- .github/workflows/tests.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 19e27ff7..b7526269 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -16,15 +16,11 @@ jobs: - name: Setup Dart SDK uses: dart-lang/setup-dart@v1.6.0 with: - sdk: 'stable' - - name: Install Melos - run: dart pub global activate melos + sdk: 'stable' - name: Install dependencies run: dart pub get - name: Analyze - run: melos run analyze + run: melos exec -- flutter analyze . - - name: Run tests - run: melos run test From 564d31a32b173e8ee3e2c83607245111b40cc213 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 13:35:54 +0200 Subject: [PATCH 08/38] add melos --- .github/workflows/tests.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index b7526269..785005e9 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -16,7 +16,9 @@ jobs: - name: Setup Dart SDK uses: dart-lang/setup-dart@v1.6.0 with: - sdk: 'stable' + sdk: 'stable' + - name: Install Melos + run: dart pub global activate melos - name: Install dependencies run: dart pub get From 2ef11a6706deaf8e1e084538dc83d585ef67dd1e Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 13:37:23 +0200 Subject: [PATCH 09/38] use dart analyze instead --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 785005e9..4f30e350 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -24,5 +24,5 @@ jobs: run: dart pub get - name: Analyze - run: melos exec -- flutter analyze . + run: dart analyze . From a640ae6cf1458e9bca3dd41d64a8a5f6f639ba90 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 13:46:28 +0200 Subject: [PATCH 10/38] add melos bootstrap --- .github/workflows/tests.yaml | 2 +- .gitignore | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4f30e350..e6fa1011 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -21,7 +21,7 @@ jobs: run: dart pub global activate melos - name: Install dependencies - run: dart pub get + run: dart pub global run melos bootstrap - name: Analyze run: dart analyze . diff --git a/.gitignore b/.gitignore index e9c9291d..a0af3053 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ coverage.lcov .dart_tool/ coverage/ *.iml +.idea/ From 246cee26a372cb2de2752a556d945043707d8686 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 14:22:51 +0200 Subject: [PATCH 11/38] make dependabot daily --- .github/dependabot.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 39bd9ac1..14173ae6 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -4,4 +4,4 @@ updates: - package-ecosystem: "pub" directory: "/" schedule: - interval: "weekly" \ No newline at end of file + interval: "daily" \ No newline at end of file From b491a0c02c812c3c58baf7a9bcea05256b9b67f5 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 15:13:44 +0200 Subject: [PATCH 12/38] add coverage workflow --- .dart_tool/package_config.json | 2 +- .github/workflows/coverage.yaml | 40 ++++++++++++++++++ ...9384a97db4862b8ab8db.cache.dill.track.dill | Bin 8269696 -> 8269696 bytes pubspec.yaml | 1 + 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/coverage.yaml diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index a9b64000..b6c22515 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -398,7 +398,7 @@ "languageVersion": "3.2" } ], - "generated": "2023-11-24T14:04:10.604503Z", + "generated": "2023-11-26T12:48:03.852937Z", "generator": "pub", "generatorVersion": "3.2.0" } diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml new file mode 100644 index 00000000..332f261f --- /dev/null +++ b/.github/workflows/coverage.yaml @@ -0,0 +1,40 @@ +name: Coverage + +on: + push: + branches: + - "*" + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Set up Repository + uses: actions/checkout@v2 + + - name: Setup Dart SDK + uses: dart-lang/setup-dart@v1.6.0 + with: + sdk: 'stable' + + - name: Install Melos + run: dart pub global activate melos + + - name: Install dependencies + run: dart pub global run melos bootstrap + + - name: Analyze + run: dart analyze . + + - name: Test and Coverage + run: | + melos exec rm -rf coverage + melos run unit_test + melos exec dart pub global run coverde filter --input ./coverage/lcov.info --output ./coverage/filtered.lcov.info --filters .g.dart + melos exec dart pub global run coverde value -i ./coverage/filtered.lcov.info > ./coverage/result.txt + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill b/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill index b219e057e88508ec040958bf1743a7b0d50d44f0..6226988adae29d9ce218eaac948b7dc6aaffa1c8 100644 GIT binary patch delta 408 zcma)#Ni%{006>SN>|3JjWlf3@vdh*c63O=2zKBHiW%o^ocX#ZMnCa@DnDG}}9F2o} zhj)APUgq;hk@6 z80n;oZhGjY4-@^E8Nh;-L58p~%m|~{8DpFY985CBG&9UH$2=0&`J@z@^5P>6(IpLHuL?WDXL6l3bh;dDv8*WLEB!xtpJMMYl zktd#c;q_hq))}3lkl*RFMq+765|e@?rX(R2O-W*0Oj>+lSHSDZY4x&0otK$1$Zslh X9!=~2Bbx{cn(W7yO`UU_WV`Ygks_Oo delta 408 zcma)#$u>d(06-5(nWsdVGbcp|88elHD3s}$UPPka%j}&NcW>E`IH#>YagJZGv2-l# zTio3}_ohF8ROvs+BOet7s3}B)mLiHNp_DSpsi2Z7s;NOoEqdyx$AFOr8fl`L7Fub; zL^~aH(nU8t^kSwD3;kHJF~A^ph8Si92cwKJj*|%{nPQq5W^pmcJPRzcgc}dbcv->6 zDr>CcXM;@w1leMn9YTcJWsiLhI7HxxV@^2b43P-uToC1wD`H#|=Z0GnB$1FwamPIm zJo3adFTB1h--dRV#}^K{ZIM_?mc^tXi;^tFqLM7e#iZ363iv$!tlp?NwK Date: Sun, 26 Nov 2023 15:36:24 +0200 Subject: [PATCH 13/38] rename workflow to build --- .github/workflows/{tests.yaml => build.yaml} | 2 +- ...9384a97db4862b8ab8db.cache.dill.track.dill | Bin 8269696 -> 8269696 bytes 2 files changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{tests.yaml => build.yaml} (95%) diff --git a/.github/workflows/tests.yaml b/.github/workflows/build.yaml similarity index 95% rename from .github/workflows/tests.yaml rename to .github/workflows/build.yaml index e6fa1011..932d570f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/build.yaml @@ -1,4 +1,4 @@ -name: Build and Test +name: Build on: push: diff --git a/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill b/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill index 6226988adae29d9ce218eaac948b7dc6aaffa1c8..48464d82adcdd2f9d76e7f6f0007ab29a33cfae3 100644 GIT binary patch delta 408 zcma)#$u>d(06-5(nWsdV%a{})WR@`%@yx?By@*7;m)Scl?%uK=aZX!*;vBzVW9eAf zx464|?oECEXi|TWLoOQf(2|c1Jp~j}L@_0lQbsuyR8ob3YK+uSiwQGz)YCvCO*GSj z1uLzz(M|`QbYY_#J3TmX(n}vM`WavlH$x0Ff`?JY7-xb>rkG|1FSE=s&jO1q;bR#; z0fMZsN{BVq5!hgpEwO-yzu(2ew(a*pI4aoI>XVVqDTo*kz_@TMr1{bNePD#@CAiX#%NYO`m9XZqQ2?u XSu~yhk91rR4e5_BmpSN>|3JjWlf3@vdh*c63O=2zKBHiW%o^ocX#ZMnCa@DnDG}}9F2o} zhj)APUgq;hk@6 z80n;oZhGjY4-@^E8Nh;-L58p~%m|~{8DpFY985CBG&9UH$2=0&`J@z@^5P>6(IpLHuL?WDXL6l3bh;dDv8*WLEB!xtpJMMYl zktd#c;q_hq))}3lkl*RFMq+765|e@?rX(R2O-W*0Oj>+lSHSDZY4x&0otK$1$Zslh X9!=~2Bbx{cn(W7yO`UU_WV`Ygks_Oo From 6579a64aaed99b78a4093afa0f21d0f81eb5d67c Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 15:42:42 +0200 Subject: [PATCH 14/38] fix workflow --- .github/workflows/coverage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 332f261f..2bf4a686 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -30,7 +30,7 @@ jobs: - name: Test and Coverage run: | melos exec rm -rf coverage - melos run unit_test + melos exec --dir-exists="test" --fail-fast -- flutter test --no-pub --coverage melos exec dart pub global run coverde filter --input ./coverage/lcov.info --output ./coverage/filtered.lcov.info --filters .g.dart melos exec dart pub global run coverde value -i ./coverage/filtered.lcov.info > ./coverage/result.txt From 396993ad3ee88a17540f5e6d3a6ac7aaebca2190 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 15:44:24 +0200 Subject: [PATCH 15/38] remove --no-pub --coverage --- .github/workflows/coverage.yaml | 2 +- ...9384a97db4862b8ab8db.cache.dill.track.dill | Bin 8269696 -> 8269696 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 2bf4a686..3c529efd 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -30,7 +30,7 @@ jobs: - name: Test and Coverage run: | melos exec rm -rf coverage - melos exec --dir-exists="test" --fail-fast -- flutter test --no-pub --coverage + melos exec --dir-exists="test" --fail-fast -- flutter test melos exec dart pub global run coverde filter --input ./coverage/lcov.info --output ./coverage/filtered.lcov.info --filters .g.dart melos exec dart pub global run coverde value -i ./coverage/filtered.lcov.info > ./coverage/result.txt diff --git a/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill b/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill index 48464d82adcdd2f9d76e7f6f0007ab29a33cfae3..d458c78075401e3976b71812587aab1de1d074b8 100644 GIT binary patch delta 408 zcma)#Ni%{006>SN>|3JjWlf3@vM))6l(J;`Y+pp8`m+0`!@E27N6d8fPt5oWE{?{* zy~De`c`x(%qsaV00fi_iLP;?y)Ra(48Rb+^Nfp)9P)i*e>e13bBRcdn(M$`iw9!rn z28?vlMK?Y4(uawD%nV?`${<777-ob~?2Iwa1P&&dVwxFdnPZ*>7Foi{GA>qdO-yzu%if9s6iu*>Q7TO+ZwB#B8u5>t{8i>4$oE+#GRpf}_Td(06-5(nWsdV%a{})WR@`%@yx?By@*7;m)Scl?%uK=aZX!*;vBzVW9eAf zx464|?oECEXi|TWLoOQf(2|c1Jp~j}L@_0lQbsuyR8ob3YK+uSiwQGz)YCvCO*GSj z1uLzz(M|`QbYY_#J3TmX(n}vM`WavlH$x0Ff`?JY7-xb>rkG|1FSE=s&jO1q;bR#; z0fMZsN{BVq5!hgpEwO-yzu(2ew(a*pI4aoI>XVVqDTo*kz_@TMr1{bNePD#@CAiX#%NYO`m9XZqQ2?u XSu~yhk91rR4e5_Bmp Date: Sun, 26 Nov 2023 15:52:17 +0200 Subject: [PATCH 16/38] update failed workflow --- .github/workflows/coverage.yaml | 24 ++++++++++-------- ...9384a97db4862b8ab8db.cache.dill.track.dill | Bin 8269696 -> 8269696 bytes 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 3c529efd..9cd690df 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -1,4 +1,4 @@ -name: Coverage +name: Build and Test on: push: @@ -13,26 +13,28 @@ jobs: - name: Set up Repository uses: actions/checkout@v2 + - name: List Files + run: ls -R + - name: Setup Dart SDK uses: dart-lang/setup-dart@v1.6.0 with: - sdk: 'stable' + sdk: 'stable' - name: Install Melos run: dart pub global activate melos - name: Install dependencies - run: dart pub global run melos bootstrap + run: melos bootstrap - name: Analyze - run: dart analyze . - - - name: Test and Coverage - run: | - melos exec rm -rf coverage - melos exec --dir-exists="test" --fail-fast -- flutter test - melos exec dart pub global run coverde filter --input ./coverage/lcov.info --output ./coverage/filtered.lcov.info --filters .g.dart - melos exec dart pub global run coverde value -i ./coverage/filtered.lcov.info > ./coverage/result.txt + run: melos run analyze + + - name: Run unit tests + run: melos run unit_test + + - name: Merge coverage + run: melos run unit_test_and_coverage - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 diff --git a/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill b/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill index d458c78075401e3976b71812587aab1de1d074b8..115cabd4cebdcbcf05bdeba1d162a2d4e5a1219a 100644 GIT binary patch delta 408 zcma)#$u>d(06-6k%u}MwWlV|?GRstXrV3@q^db`VUS{vKxO>Zf#5ryKiF5pdjiqB@ z-{S7>xi|g!qe}ll9{H#!KusYI2dJ&ahyyr$rRJfFv}eCxL9D3C6-yijR!BQ z2&}Qr2Agc*!%u*1cGx9Ih&}c>;E*s!9CN}cXNW{N=YlAgToL1%I5*sqAc=%biaYLk z;E^YudExb4`PQ2RZ&2`sY>`+>mc?XP79}|xi%PN>7n9b2;P$&*S)D;~YH~6qqw-c{ Y$)Rcce`FH=ur~AYW!GdqX2qfY1*{^Q!vFvP delta 408 zcma)#Ni%{006>SN>|3JjWlf3@vM))6l(J;`Y+pp8`m+0`!@E27N6d8fPt5oWE{?{* zy~De`c`x(%qsaV00fi_iLP;?y)Ra(48Rb+^Nfp)9P)i*e>e13bBRcdn(M$`iw9!rn z28?vlMK?Y4(uawD%nV?`${<777-ob~?2Iwa1P&&dVwxFdnPZ*>7Foi{GA>qdO-yzu%if9s6iu*>Q7TO+ZwB#B8u5>t{8i>4$oE+#GRpf}_T Date: Sun, 26 Nov 2023 15:54:30 +0200 Subject: [PATCH 17/38] remove analyze --- .github/workflows/coverage.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 9cd690df..356d4581 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -27,9 +27,6 @@ jobs: - name: Install dependencies run: melos bootstrap - - name: Analyze - run: melos run analyze - - name: Run unit tests run: melos run unit_test From 5b2e4c92f2fb7c2a111477093e341b94aacf0a95 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 15:58:15 +0200 Subject: [PATCH 18/38] add flutter --- .github/workflows/coverage.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 356d4581..3a3c525b 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -20,6 +20,10 @@ jobs: uses: dart-lang/setup-dart@v1.6.0 with: sdk: 'stable' + - name: Setup Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: '3.16.0' - name: Install Melos run: dart pub global activate melos From b13a93abd4f3a02b5b822b0f74642936d87a645b Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 16:01:59 +0200 Subject: [PATCH 19/38] add tests workflow --- .github/workflows/tests.yaml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/tests.yaml diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml new file mode 100644 index 00000000..1779dc51 --- /dev/null +++ b/.github/workflows/tests.yaml @@ -0,0 +1,35 @@ +name: Run Tests + +on: + push: + branches: + - "*" + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Set up Repository + uses: actions/checkout@v2 + + - name: List Files + run: ls -R + + - name: Setup Dart SDK + uses: dart-lang/setup-dart@v1.6.0 + with: + sdk: 'stable' + - name: Setup Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: '3.16.0' + + - name: Install Melos + run: dart pub global activate melos + + - name: Install dependencies + run: melos bootstrap + + - name: Run unit tests + run: melos run unit_test \ No newline at end of file From 363a031e525081c620e3e1ee35e96cd96ddce578 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 16:08:45 +0200 Subject: [PATCH 20/38] update melos.yaml --- .github/workflows/coverage.yaml | 10 ++++++---- melos.yaml | 6 ++++-- ...9384a97db4862b8ab8db.cache.dill.track.dill | Bin 8269696 -> 8269696 bytes 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 3a3c525b..2f035f88 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -1,4 +1,4 @@ -name: Build and Test +name: Upload Coverage on: push: @@ -19,20 +19,22 @@ jobs: - name: Setup Dart SDK uses: dart-lang/setup-dart@v1.6.0 with: - sdk: 'stable' + sdk: "stable" - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: '3.16.0' + flutter-version: "3.16.0" - name: Install Melos - run: dart pub global activate melos + run: dart pub global activate melos - name: Install dependencies run: melos bootstrap - name: Run unit tests run: melos run unit_test + - name: Create coverage directory + run: mkdir -p coverage - name: Merge coverage run: melos run unit_test_and_coverage diff --git a/melos.yaml b/melos.yaml index 269b005b..3de4e7b1 100644 --- a/melos.yaml +++ b/melos.yaml @@ -14,7 +14,9 @@ scripts: run: | melos exec rm -rf coverage melos run unit_test - melos exec dart pub global run coverde filter --input ./coverage/lcov.info --output ./coverage/filtered.lcov.info --filters .g.dart - melos exec dart pub global run coverde value -i ./coverage/filtered.lcov.info > ./coverage/result.txt + melos exec bash -c 'cd $(pwd) && dart pub global run coverde filter --input coverage/lcov.info --output coverage/filtered.lcov.info --filters .g.dart' + melos exec bash -c 'cd $(pwd) && dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' + + diff --git a/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill b/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill index 115cabd4cebdcbcf05bdeba1d162a2d4e5a1219a..3973c28b0dc05d535a769dde8729b2623bd7d9c8 100644 GIT binary patch delta 408 zcma)#$u>d(06-6k%u}MwWlV|?GLuTEkRj7Ey@*7;m)Scl?%uK=aZX!*;vBzVW9eAf zx464|?oEIGsM3FsM?NYFP*X?|8j2~QlrqYxppq)8si77vb?B(40X+s9X`-1HT4|#l zBPKfNq>FBP=*3JQ7W%PbV}L>I3^B|I4n`Sc948Y@GQ~7A%reJ33%FRsjR!AF_*iCz zRr~}9vc@_agxF+@ZFUH=%O3k2aEQPW$DDA=86pwRxgg3VSH!p`&JDLDNFpJV;*NVB zc;ty^UU+?1zV#-zKNxTaZIM_?mc^tXi;^tFqLM7e#iZ5c352}itj?e~H947*QF$w} Y_8S#hX;0gJ(#djJ3c delta 408 zcma)#$u>d(06-6k%u}MwWlV|?GRstXrV3@q^db`VUS{vKxO>Zf#5ryKiF5pdjiqB@ z-{S7>xi|g!qe}ll9{H#!KusYI2dJ&ahyyr$rRJfFv}eCxL9D3C6-yijR!BQ z2&}Qr2Agc*!%u*1cGx9Ih&}c>;E*s!9CN}cXNW{N=YlAgToL1%I5*sqAc=%biaYLk z;E^YudExb4`PQ2RZ&2`sY>`+>mc?XP79}|xi%PN>7n9b2;P$&*S)D;~YH~6qqw-c{ Y$)Rcce`FH=ur~AYW!GdqX2qfY1*{^Q!vFvP From 1c190ccd8a52035cd3210c521e35e020c1f3abb0 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 16:12:36 +0200 Subject: [PATCH 21/38] fix workflow --- .github/workflows/coverage.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 2f035f88..b605d529 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -33,11 +33,16 @@ jobs: - name: Run unit tests run: melos run unit_test + - name: Create coverage directory run: mkdir -p coverage - name: Merge coverage - run: melos run unit_test_and_coverage + run: | + melos exec rm -rf coverage + melos run unit_test + melos exec bash -c 'cd $(pwd) && dart pub global run coverde filter --input coverage/lcov.info --output coverage/filtered.lcov.info --filters .g.dart' + melos exec bash -c 'cd $(pwd) && dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 From e733570d8efc0ea9239b734e1ef6163f0cf3f91b Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 16:16:52 +0200 Subject: [PATCH 22/38] remove pwd --- .github/workflows/coverage.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index b605d529..c3091a83 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -41,8 +41,8 @@ jobs: run: | melos exec rm -rf coverage melos run unit_test - melos exec bash -c 'cd $(pwd) && dart pub global run coverde filter --input coverage/lcov.info --output coverage/filtered.lcov.info --filters .g.dart' - melos exec bash -c 'cd $(pwd) && dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' + melos exec bash -c 'cd coverage && dart pub global run coverde filter --input coverage/lcov.info --output coverage/filtered.lcov.info --filters .g.dart' + melos exec bash -c 'cd coverage && dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 From f984c586db805e983ff52ede985f96632f61234e Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 16:20:05 +0200 Subject: [PATCH 23/38] update workflow --- .github/workflows/coverage.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index c3091a83..00be234b 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -41,8 +41,8 @@ jobs: run: | melos exec rm -rf coverage melos run unit_test - melos exec bash -c 'cd coverage && dart pub global run coverde filter --input coverage/lcov.info --output coverage/filtered.lcov.info --filters .g.dart' - melos exec bash -c 'cd coverage && dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' + melos exec --dir-exists="coverage" -- bash -c 'dart pub global run coverde filter --input coverage/lcov.info --output coverage/filtered.lcov.info --filters .g.dart' + melos exec --dir-exists="coverage" -- bash -c 'dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 From a4c1b7f21b970fa2bf1c0f08f135a4d1ff00e105 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 16:44:19 +0200 Subject: [PATCH 24/38] add link to badge --- README.md | 3 ++- melos.yaml | 6 +----- ...9384a97db4862b8ab8db.cache.dill.track.dill | Bin 8269696 -> 8269696 bytes 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 10d52775..1f1658a2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # tfgrid-sdk-dart -[![melos](https://img.shields.io/badge/maintained%20with-melos-f700ff.svg?style=flat-square)](https://github.com/invertase/melos) +[![melos](https://img.shields.io/badge/maintained%20with-melos-f700ff.svg?style=flat-square)](https://github.com/invertase/melos) [![Coverage Status](https://img.shields.io/badge/coverage-86.36-%23ff69b4)](https://app.codecov.io/gh/codescalers/tfgrid-sdk-dart) + ## Prerequisites Make sure you have the following tools installed: diff --git a/melos.yaml b/melos.yaml index 3de4e7b1..3910cc8f 100644 --- a/melos.yaml +++ b/melos.yaml @@ -15,8 +15,4 @@ scripts: melos exec rm -rf coverage melos run unit_test melos exec bash -c 'cd $(pwd) && dart pub global run coverde filter --input coverage/lcov.info --output coverage/filtered.lcov.info --filters .g.dart' - melos exec bash -c 'cd $(pwd) && dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' - - - - + melos exec bash -c 'cd $(pwd) && dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' \ No newline at end of file diff --git a/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill b/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill index 3973c28b0dc05d535a769dde8729b2623bd7d9c8..211f3f4f510f0c285bdc9ee0d5c23116364084d2 100644 GIT binary patch delta 405 zcma)#$u>d(06-5(nWsdVGZ#h3kU2yddW4M6^db`VUS{vKxF2BGk2t5TKXHz4u&{J2 ztXbUMJ@=;Gzci^I$RZmJIcUj6hn_t0DWH%diYcL#GRmpIKqW@1sK$hu8fvMdo(39e z!a_4Gw9-a99du&FMi<@KanM6APWtF)02hM{G0X^VMj2zA2_~6h8V@tfGKZIW7VzO` zktLQ{A%MUtYXn(mgH1wgvCR&ZNU|bEBeEjJq=Y>nc!iLVF`8Ak{y(B@QD1bn Xzl)CFLpmN54e7TJr#|DesxIv}@jaUQ delta 405 zcma)#$u>d(06-5(nWsdVGZ#h3kXb6BLWWGw^db`VUS{vKxF2BGk2t5TKXHz4u&{J2 ztXbUMJ@=;Hzf|cT$RQUMd8o-pgO&mcDWaGXN-3k93M#2WM>TqCsKtPhI_hblktUjH z!9*)B z#4>&Y1X*E~HA1Yj!6sXT*=C1b_Si?@fJ2Tr<^+)lr<@VxoC{)H66cC*5+sq3NpZt1 zcii*9BTqcPDxU_EKNxTaZIM_?mc^tXi;^tFqLM7e#iZ5c352}itlp?Nwf_+%lk%dm Y{9UyD9x{oLpv$~{*tJ=oS#hYp0oSXVsQ>@~ From 77cae0d6f308b49e8b4443a76dc0f9159a5c406d Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 17:14:37 +0200 Subject: [PATCH 25/38] update melos.yaml --- melos.yaml | 6 +++--- packages/signer/.gitignore | 2 ++ ...9384a97db4862b8ab8db.cache.dill.track.dill | Bin 8269696 -> 8269696 bytes 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/melos.yaml b/melos.yaml index 3910cc8f..a9d148a5 100644 --- a/melos.yaml +++ b/melos.yaml @@ -10,9 +10,9 @@ scripts: run: melos exec --dir-exists="test" --fail-fast -- flutter test --no-pub --coverage description: Run all Flutter tests in this project. unit_test_and_coverage: - description: Merge all packages coverage tracefiles ignoring data related to generated files. + description: Merge all packages coverage trace files ignoring data related to generated files. run: | melos exec rm -rf coverage melos run unit_test - melos exec bash -c 'cd $(pwd) && dart pub global run coverde filter --input coverage/lcov.info --output coverage/filtered.lcov.info --filters .g.dart' - melos exec bash -c 'cd $(pwd) && dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' \ No newline at end of file + melos exec -c 1 --file-exists=coverage/lcov.info -- coverde filter --input ./coverage/lcov.info --output MELOS_ROOT_PATH/coverage/filtered.lcov.info --filters \.g\.dart + coverde value -i coverage/filtered.lcov.info > MELOS_ROOT_PATH/coverage/result.txt diff --git a/packages/signer/.gitignore b/packages/signer/.gitignore index 303ec140..0c6bc08c 100644 --- a/packages/signer/.gitignore +++ b/packages/signer/.gitignore @@ -6,3 +6,5 @@ coverage.lcov .dart_tool *.iml + +build/ \ No newline at end of file diff --git a/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill b/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill index 211f3f4f510f0c285bdc9ee0d5c23116364084d2..86e468bab3b1da495b89a5ea350f787ad1d92718 100644 GIT binary patch delta 408 zcma)#Ni%{006>SN>|3JjWlf3@vL{>hl_iob+ZU0jzU;o~@a~TN5i?!=6EpsTi=%OH z@9=JK-phRcC^COgKp_f>P*RKvH6@f%MmZH!Qbjd2)KZ6rdbBjqhz>nXG}A&WZM4&Y z0VADs(M=D%^kJeOGXq$#GRP1%h8bZLJ7bJ9frCk=m}Z7q=9tIH0xlL=Vwn|IapS>@ zfDb=wth2!;0k+sC$POWP*<+sr4heI_F(;gIhDd~SE{Jl;6)~=fbHgnOlBAGGbH_ao zJo3adFTB3X-#Vkd(06-5(nWsdV%a{})WEMpkdW4M6^db_~%j}&NcW>E`IH#>YagJZGv2-l# zTio3}_ohF8ROvs+BOet7s3}B)mLiHNp_DSpsi2Z7s;NOoEqdyx$AFOr8fl`L7Fub; zgqe0a=%kBoda%%ol|F3P>1O~3gA6f@lMzN4!^JogOftnZGt4rFn|T)S;AN2|eE3;r zg;mxFAh6B`K{nZ9n-Dwfvd2CL93pbWF(;gIhD4ZiE{Jf+6;ZB Date: Sun, 26 Nov 2023 17:26:58 +0200 Subject: [PATCH 26/38] update badge automatically --- .github/workflows/coverage.yaml | 8 ++++++++ README.md | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 00be234b..cde4e9e9 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -44,6 +44,14 @@ jobs: melos exec --dir-exists="coverage" -- bash -c 'dart pub global run coverde filter --input coverage/lcov.info --output coverage/filtered.lcov.info --filters .g.dart' melos exec --dir-exists="coverage" -- bash -c 'dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' + - name: Print COVERAGE_PERCENTAGE + run: | + COVERAGE_PERCENTAGE=$(grep -A1 "GLOBAL:" coverage/result.txt | tail -n 1 | cut -d ' ' -f 1) + echo "COVERAGE_PERCENTAGE: $COVERAGE_PERCENTAGE" + + - name: Update Coverage Badge + run: echo "::set-output name=COVERAGE_PERCENTAGE::$COVERAGE_PERCENTAGE" + - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 with: diff --git a/README.md b/README.md index 1f1658a2..11740a0f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # tfgrid-sdk-dart -[![melos](https://img.shields.io/badge/maintained%20with-melos-f700ff.svg?style=flat-square)](https://github.com/invertase/melos) [![Coverage Status](https://img.shields.io/badge/coverage-86.36-%23ff69b4)](https://app.codecov.io/gh/codescalers/tfgrid-sdk-dart) +[![melos](https://img.shields.io/badge/maintained%20with-melos-f700ff.svg?style=flat-square)](https://github.com/invertase/melos) [![Coverage Status](https://img.shields.io/badge/coverage-$COVERAGE_PERCENTAGE-%23ff69b4)](https://app.codecov.io/gh/codescalers/tfgrid-sdk-dart) ## Prerequisites From d7aa66905d061a0af391afe94e40c8817505651b Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 17:49:58 +0200 Subject: [PATCH 27/38] remove coverage from gitignore --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index a0af3053..15b2f878 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,5 @@ pubspec.lock -coverage/ -coverage.lcov - .dart_tool/ coverage/ *.iml From bf44d0326e38998877dc1ecc26736ba848080730 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 17:52:51 +0200 Subject: [PATCH 28/38] add coverage file --- .gitignore | 1 - coverage/filtered.lcov.info | 52 ++++++++++++++++++ coverage/result.txt | 5 ++ ...9384a97db4862b8ab8db.cache.dill.track.dill | Bin 8269696 -> 8269696 bytes 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 coverage/filtered.lcov.info create mode 100644 coverage/result.txt diff --git a/.gitignore b/.gitignore index 15b2f878..9e4974a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ pubspec.lock .dart_tool/ -coverage/ *.iml .idea/ diff --git a/coverage/filtered.lcov.info b/coverage/filtered.lcov.info new file mode 100644 index 00000000..1e2b4b6d --- /dev/null +++ b/coverage/filtered.lcov.info @@ -0,0 +1,52 @@ +SF:lib/src/sign.dart +DA:6,1 +DA:8,2 +DA:10,2 +DA:14,1 +DA:16,2 +DA:18,2 +DA:22,1 +DA:24,2 +DA:25,3 +DA:27,2 +DA:31,1 +DA:32,1 +DA:33,1 +DA:36,2 +DA:37,2 +DA:40,0 +DA:44,1 +DA:45,1 +DA:46,0 +DA:49,2 +DA:50,2 +DA:52,0 +LF:22 +LH:19 +end_of_record +SF:lib/src/sign.dart +DA:6,1 +DA:8,2 +DA:10,2 +DA:14,1 +DA:16,2 +DA:18,2 +DA:22,1 +DA:24,2 +DA:25,3 +DA:27,2 +DA:31,1 +DA:32,1 +DA:33,1 +DA:36,2 +DA:37,2 +DA:40,0 +DA:44,1 +DA:45,1 +DA:46,0 +DA:49,2 +DA:50,2 +DA:52,0 +LF:22 +LH:19 +end_of_record diff --git a/coverage/result.txt b/coverage/result.txt new file mode 100644 index 00000000..fdd6f0b9 --- /dev/null +++ b/coverage/result.txt @@ -0,0 +1,5 @@ +lib/src/sign.dart (86.36% - 19/22) +lib/src/sign.dart (86.36% - 19/22) + +GLOBAL: +86.36% - 38/44 diff --git a/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill b/packages/signer/build/test_cache/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill index 86e468bab3b1da495b89a5ea350f787ad1d92718..01260717ee4a499a78274981ba36477279fd88af 100644 GIT binary patch delta 408 zcma)#$u>d(06-6k%u}MwWlV|?GE;^!M9ItaOfMo)?`76$arc(}h;!Qd6X*B^8%xK+ zzQx_$b8q_dN0t7AJn~UdfSN*z&`?YXrIb-l1(j4$O%1hZsY6FS4d^k@NE6Mp&`KNa z7%|a7CtY;YLoa6fu+Wbc8v_htXNX}&a4^ak<2adMk}0N{VU{`OS-^#xMV44*1rJ_U zS!10Id~C9Xp8(qg*+C%0E_>{Az#$?>9CN}cXGnxO=Yj~AToL7(7&qJ!CxMJYk~{8s z;E^YudExav^{qGgf^fYH~7VW9qHQ Yl0(z>|H#AxqBisKW!Gdq=9EMI3(y>#F8}}l delta 408 zcma)#Ni%{006>SN>|3JjWlf3@vL{>hl_iob+ZU0jzU;o~@a~TN5i?!=6EpsTi=%OH z@9=JK-phRcC^COgKp_f>P*RKvH6@f%MmZH!Qbjd2)KZ6rdbBjqhz>nXG}A&WZM4&Y z0VADs(M=D%^kJeOGXq$#GRP1%h8bZLJ7bJ9frCk=m}Z7q=9tIH0xlL=Vwn|IapS>@ zfDb=wth2!;0k+sC$POWP*<+sr4heI_F(;gIhDd~SE{Jl;6)~=fbHgnOlBAGGbH_ao zJo3adFTB3X-#Vk Date: Sun, 26 Nov 2023 17:58:36 +0200 Subject: [PATCH 29/38] update coverage badge --- .github/workflows/coverage.yaml | 10 +--------- README.md | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index cde4e9e9..f06186dc 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -43,15 +43,7 @@ jobs: melos run unit_test melos exec --dir-exists="coverage" -- bash -c 'dart pub global run coverde filter --input coverage/lcov.info --output coverage/filtered.lcov.info --filters .g.dart' melos exec --dir-exists="coverage" -- bash -c 'dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' - - - name: Print COVERAGE_PERCENTAGE - run: | - COVERAGE_PERCENTAGE=$(grep -A1 "GLOBAL:" coverage/result.txt | tail -n 1 | cut -d ' ' -f 1) - echo "COVERAGE_PERCENTAGE: $COVERAGE_PERCENTAGE" - - - name: Update Coverage Badge - run: echo "::set-output name=COVERAGE_PERCENTAGE::$COVERAGE_PERCENTAGE" - + - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 with: diff --git a/README.md b/README.md index 11740a0f..aa820c3c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # tfgrid-sdk-dart -[![melos](https://img.shields.io/badge/maintained%20with-melos-f700ff.svg?style=flat-square)](https://github.com/invertase/melos) [![Coverage Status](https://img.shields.io/badge/coverage-$COVERAGE_PERCENTAGE-%23ff69b4)](https://app.codecov.io/gh/codescalers/tfgrid-sdk-dart) +[![melos](https://img.shields.io/badge/maintained%20with-melos-f700ff.svg?style=flat-square)](https://github.com/invertase/melos) [![codecov](https://codecov.io/gh/codescalers/tfgrid-sdk-dart/graph/badge.svg?token=O34UDTMW5O)](https://codecov.io/gh/codescalers/tfgrid-sdk-dart) ## Prerequisites From fae73d7ef79c48d6b2f068be39355beba1e1bf7b Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Sun, 26 Nov 2023 19:43:55 +0200 Subject: [PATCH 30/38] add coverage in gitignore --- .dart_tool/package_config.json | 2 +- .gitignore | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index b6c22515..b34836ad 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -398,7 +398,7 @@ "languageVersion": "3.2" } ], - "generated": "2023-11-26T12:48:03.852937Z", + "generated": "2023-11-26T17:31:41.571548Z", "generator": "pub", "generatorVersion": "3.2.0" } diff --git a/.gitignore b/.gitignore index 9e4974a7..2fd225b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ pubspec.lock +coverage/ .dart_tool/ *.iml From af270a43eca4fbcdb099cfdb1adb72414f82c280 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Mon, 27 Nov 2023 10:31:24 +0200 Subject: [PATCH 31/38] rename analyze to linting --- .dart_tool/package_config.json | 2 +- .github/workflows/build.yaml | 2 +- melos.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index b34836ad..26fcf4e4 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -398,7 +398,7 @@ "languageVersion": "3.2" } ], - "generated": "2023-11-26T17:31:41.571548Z", + "generated": "2023-11-27T08:27:25.152414Z", "generator": "pub", "generatorVersion": "3.2.0" } diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 932d570f..0a91177e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,6 +23,6 @@ jobs: - name: Install dependencies run: dart pub global run melos bootstrap - - name: Analyze + - name: Linting run: dart analyze . diff --git a/melos.yaml b/melos.yaml index a9d148a5..6ecefa2a 100644 --- a/melos.yaml +++ b/melos.yaml @@ -5,7 +5,7 @@ packages: scripts: analyze: run: melos exec -- flutter analyze . - description: Run `dart analyze` in all packages. + description: Run `dart analyze` in all packages (linting). unit_test: run: melos exec --dir-exists="test" --fail-fast -- flutter test --no-pub --coverage description: Run all Flutter tests in this project. From ca7759676940c21b169ad204cbcb4a220e1e5275 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Thu, 27 Jun 2024 14:58:13 +0300 Subject: [PATCH 32/38] fix lint workflow --- packages/signer/test/signer_test.dart | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/signer/test/signer_test.dart b/packages/signer/test/signer_test.dart index 2d2a8e81..ab90cdc6 100644 --- a/packages/signer/test/signer_test.dart +++ b/packages/signer/test/signer_test.dart @@ -1,6 +1,5 @@ import 'dart:typed_data'; -import 'package:polkadart_keyring/polkadart_keyring.dart'; import 'package:signer/signer.dart'; import 'package:test/test.dart'; @@ -18,16 +17,16 @@ void main() { await signer.fromMnemonic(mnemonic, KPType.ed25519); final data = 'dummyData'; - final signature = await signer.sign(data); + final signature = signer.sign(data); - final isVerified = await signer.verify(signature, data); + final isVerified = signer.verify(signature, data); expect(isVerified, isTrue); }); test('Test not initializing signer', () async { final data = 'dummyData'; try { - await signer.sign(data); + signer.sign(data); fail('Expected an exception when signing with uninitialized signer.'); } catch (e) { expect(e, isA()); @@ -49,10 +48,10 @@ void main() { await signer.fromMnemonic(mnemonic, KPType.ed25519); final data = 'dummyData'; - final signature = await signer.sign(data); - final modifiedSignature = signature + '00'; + final signature = signer.sign(data); + final modifiedSignature = '${signature}00'; - final isVerified = await signer.verify(modifiedSignature, data); + final isVerified = signer.verify(modifiedSignature, data); expect(isVerified, isFalse); }); @@ -63,7 +62,7 @@ void main() { 148, 202, ]); - expect(() async => await signer.fromSeed(invalidSeed, KPType.ed25519), + expect(() async => signer.fromSeed(invalidSeed, KPType.ed25519), throwsException); }); @@ -78,9 +77,9 @@ void main() { await signer.fromMnemonic(mnemonic, KPType.ed25519); final data = ''; - final signature = await signer.sign(data); + final signature = signer.sign(data); - final isVerified = await signer.verify(signature, data); + final isVerified = signer.verify(signature, data); expect(isVerified, isTrue); }); @@ -90,10 +89,10 @@ void main() { await signer.fromMnemonic(mnemonic, KPType.ed25519); final originalData = 'originalData'; - final signature = await signer.sign(originalData); + final signature = signer.sign(originalData); final differentData = 'differentData'; - final isVerified = await signer.verify(signature, differentData); + final isVerified = signer.verify(signature, differentData); expect(isVerified, isFalse); }); }); From a23857525e055e07a27e2048f2cd75a245385f14 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Thu, 27 Jun 2024 15:03:24 +0300 Subject: [PATCH 33/38] make all workflows work on pull requests against main branch --- .github/workflows/build.yaml | 11 +++++------ .github/workflows/coverage.yaml | 4 ++-- .github/workflows/tests.yaml | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0a91177e..4efa75c8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,9 +1,9 @@ name: Build on: - push: + pull_request: branches: - - "*" + - main jobs: build: @@ -16,13 +16,12 @@ jobs: - name: Setup Dart SDK uses: dart-lang/setup-dart@v1.6.0 with: - sdk: 'stable' + sdk: "stable" - name: Install Melos - run: dart pub global activate melos - + run: dart pub global activate melos + - name: Install dependencies run: dart pub global run melos bootstrap - name: Linting run: dart analyze . - diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index f06186dc..10a1c7a1 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -1,9 +1,9 @@ name: Upload Coverage on: - push: + pull_request: branches: - - "*" + - main jobs: build: diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 1779dc51..d709a1c8 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -1,9 +1,9 @@ name: Run Tests on: - push: + pull_request: branches: - - "*" + - main jobs: build: From b303a952d595ff58bbc099af00aa3b5589c13a3a Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Thu, 27 Jun 2024 15:20:44 +0300 Subject: [PATCH 34/38] add coverage to gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 47a03d0c..87c0e251 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,5 @@ coverage/ /packages/*/build /packages/*/idea -coverage/ *.iml .idea From 45e8af72fa28f1538617e2a32228bf58945ae2b2 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Thu, 27 Jun 2024 15:24:08 +0300 Subject: [PATCH 35/38] remove unnecssary logic from coverage workflow --- .github/workflows/coverage.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 10a1c7a1..851215fc 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -20,10 +20,6 @@ jobs: uses: dart-lang/setup-dart@v1.6.0 with: sdk: "stable" - - name: Setup Flutter - uses: subosito/flutter-action@v2 - with: - flutter-version: "3.16.0" - name: Install Melos run: dart pub global activate melos @@ -31,12 +27,6 @@ jobs: - name: Install dependencies run: melos bootstrap - - name: Run unit tests - run: melos run unit_test - - - name: Create coverage directory - run: mkdir -p coverage - - name: Merge coverage run: | melos exec rm -rf coverage From 40a917b9fa2a12676c14f24248023138e68f6cb8 Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Thu, 27 Jun 2024 16:08:54 +0300 Subject: [PATCH 36/38] fix coverage workflow --- .github/workflows/coverage.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 851215fc..ee0e7302 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -20,6 +20,10 @@ jobs: uses: dart-lang/setup-dart@v1.6.0 with: sdk: "stable" + - name: Setup Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: "3.16.0" - name: Install Melos run: dart pub global activate melos @@ -27,6 +31,12 @@ jobs: - name: Install dependencies run: melos bootstrap + - name: Run unit tests + run: melos run unit_test + + - name: Create coverage directory + run: mkdir -p coverage + - name: Merge coverage run: | melos exec rm -rf coverage @@ -38,3 +48,4 @@ jobs: uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} + files: coverage/filtered.lcov.info From cd753b833a69a1c84abd7939f2e109606cb28be3 Mon Sep 17 00:00:00 2001 From: Alaa228 Date: Thu, 27 Jun 2024 16:25:27 +0300 Subject: [PATCH 37/38] Delete coverage directory --- coverage/filtered.lcov.info | 52 ------------------------------------- coverage/result.txt | 5 ---- 2 files changed, 57 deletions(-) delete mode 100644 coverage/filtered.lcov.info delete mode 100644 coverage/result.txt diff --git a/coverage/filtered.lcov.info b/coverage/filtered.lcov.info deleted file mode 100644 index 1e2b4b6d..00000000 --- a/coverage/filtered.lcov.info +++ /dev/null @@ -1,52 +0,0 @@ -SF:lib/src/sign.dart -DA:6,1 -DA:8,2 -DA:10,2 -DA:14,1 -DA:16,2 -DA:18,2 -DA:22,1 -DA:24,2 -DA:25,3 -DA:27,2 -DA:31,1 -DA:32,1 -DA:33,1 -DA:36,2 -DA:37,2 -DA:40,0 -DA:44,1 -DA:45,1 -DA:46,0 -DA:49,2 -DA:50,2 -DA:52,0 -LF:22 -LH:19 -end_of_record -SF:lib/src/sign.dart -DA:6,1 -DA:8,2 -DA:10,2 -DA:14,1 -DA:16,2 -DA:18,2 -DA:22,1 -DA:24,2 -DA:25,3 -DA:27,2 -DA:31,1 -DA:32,1 -DA:33,1 -DA:36,2 -DA:37,2 -DA:40,0 -DA:44,1 -DA:45,1 -DA:46,0 -DA:49,2 -DA:50,2 -DA:52,0 -LF:22 -LH:19 -end_of_record diff --git a/coverage/result.txt b/coverage/result.txt deleted file mode 100644 index fdd6f0b9..00000000 --- a/coverage/result.txt +++ /dev/null @@ -1,5 +0,0 @@ -lib/src/sign.dart (86.36% - 19/22) -lib/src/sign.dart (86.36% - 19/22) - -GLOBAL: -86.36% - 38/44 From 762e84d88254727b38def963534592ab3361f28f Mon Sep 17 00:00:00 2001 From: AlaaElattar Date: Thu, 27 Jun 2024 17:02:30 +0300 Subject: [PATCH 38/38] fix renaming && remove tests workflow && add conditions checking success --- .../workflows/{build.yaml => analyze.yaml} | 7 ++-- .github/workflows/coverage.yaml | 10 +++++- .github/workflows/tests.yaml | 35 ------------------- 3 files changed, 14 insertions(+), 38 deletions(-) rename .github/workflows/{build.yaml => analyze.yaml} (86%) delete mode 100644 .github/workflows/tests.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/analyze.yaml similarity index 86% rename from .github/workflows/build.yaml rename to .github/workflows/analyze.yaml index 4efa75c8..98c79a7b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/analyze.yaml @@ -1,9 +1,12 @@ -name: Build +name: Analyze on: pull_request: branches: - main + push: + branches: + - main jobs: build: @@ -23,5 +26,5 @@ jobs: - name: Install dependencies run: dart pub global run melos bootstrap - - name: Linting + - name: Analyze run: dart analyze . diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index ee0e7302..532b1e36 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -4,6 +4,9 @@ on: pull_request: branches: - main + push: + branches: + - main jobs: build: @@ -37,14 +40,19 @@ jobs: - name: Create coverage directory run: mkdir -p coverage - - name: Merge coverage + - name: Run unit tests run: | melos exec rm -rf coverage melos run unit_test + + - name: Calculate and merge coverage + if: success() + run: | melos exec --dir-exists="coverage" -- bash -c 'dart pub global run coverde filter --input coverage/lcov.info --output coverage/filtered.lcov.info --filters .g.dart' melos exec --dir-exists="coverage" -- bash -c 'dart pub global run coverde value -i coverage/filtered.lcov.info > coverage/result.txt' - name: Upload coverage to Codecov + if: success() uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml deleted file mode 100644 index d709a1c8..00000000 --- a/.github/workflows/tests.yaml +++ /dev/null @@ -1,35 +0,0 @@ -name: Run Tests - -on: - pull_request: - branches: - - main - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Set up Repository - uses: actions/checkout@v2 - - - name: List Files - run: ls -R - - - name: Setup Dart SDK - uses: dart-lang/setup-dart@v1.6.0 - with: - sdk: 'stable' - - name: Setup Flutter - uses: subosito/flutter-action@v2 - with: - flutter-version: '3.16.0' - - - name: Install Melos - run: dart pub global activate melos - - - name: Install dependencies - run: melos bootstrap - - - name: Run unit tests - run: melos run unit_test \ No newline at end of file