From 158fe79e50ac949c7cab909f31275550c01c24ae Mon Sep 17 00:00:00 2001 From: marinakalyuzhnaya Date: Fri, 10 Dec 2021 17:01:15 +0100 Subject: [PATCH 1/9] test --- dist/main.js | 2 +- src/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/main.js b/dist/main.js index 93a7854e..b8b8bff2 100644 --- a/dist/main.js +++ b/dist/main.js @@ -6302,7 +6302,7 @@ const getLcovBaseFiles = (dir, filelist) => { fileArray = fs__default.statSync(path.join(dir, file)).isDirectory() ? getLcovBaseFiles(path.join(dir, file), fileArray) : fileArray - .filter(f => f.path.includes("lcov-base.info")) + .filter(f => f.path.includes("lcov-base")) .concat({ name: dir.split("/")[1], path: path.join(dir, file), diff --git a/src/index.js b/src/index.js index 2b3607f0..009a32de 100644 --- a/src/index.js +++ b/src/index.js @@ -40,7 +40,7 @@ const getLcovBaseFiles = (dir, filelist) => { fileArray = fs.statSync(path.join(dir, file)).isDirectory() ? getLcovBaseFiles(path.join(dir, file), fileArray) : fileArray - .filter(f => f.path.includes("lcov-base.info")) + .filter(f => f.path.includes("lcov-base")) .concat({ name: dir.split("/")[1], path: path.join(dir, file), From 5d8fcc76f2e9c5375dbd62b2da35a0a7191e2a0a Mon Sep 17 00:00:00 2001 From: marinakalyuzhnaya Date: Fri, 10 Dec 2021 17:08:55 +0100 Subject: [PATCH 2/9] test --- dist/main.js | 1 + src/comment.js | 1 + 2 files changed, 2 insertions(+) diff --git a/dist/main.js b/dist/main.js index b8b8bff2..ba169f21 100644 --- a/dist/main.js +++ b/dist/main.js @@ -6086,6 +6086,7 @@ const commentForMonorepo = ( let report = lcovObj.lcov; if (baseLcov) { + console.log(baseLcov, 'baseLcov on comment compare'); const onlyInLcov = lcovObj.lcov.filter(comparer(baseLcov)); const onlyInBefore = baseLcov.filter(comparer(lcovObj.lcov)); report = onlyInBefore.concat(onlyInLcov); diff --git a/src/comment.js b/src/comment.js index c3ffc58c..22bd6026 100644 --- a/src/comment.js +++ b/src/comment.js @@ -68,6 +68,7 @@ const commentForMonorepo = ( let report = lcovObj.lcov; if (baseLcov) { + console.log(baseLcov, "baseLcov on comment compare"); const onlyInLcov = lcovObj.lcov.filter(comparer(baseLcov)); const onlyInBefore = baseLcov.filter(comparer(lcovObj.lcov)); report = onlyInBefore.concat(onlyInLcov); From 6c5f69d54b6bce939f7b55dd02a5b7e92c076b10 Mon Sep 17 00:00:00 2001 From: marinakalyuzhnaya Date: Fri, 10 Dec 2021 17:12:28 +0100 Subject: [PATCH 3/9] test --- dist/main.js | 3 ++- src/comment.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/main.js b/dist/main.js index ba169f21..5f235880 100644 --- a/dist/main.js +++ b/dist/main.js @@ -6056,6 +6056,7 @@ const commentForMonorepo = ( ) => { const { base } = options; const html = lcovArrayForMonorepo.map(lcovObj => { + console.log(lcovBaseArrayForMonorepo, 'lcovBaseArrayForMonorepo'); const baseLcov = lcovBaseArrayForMonorepo.find( el => el.packageName === lcovObj.packageName, ); @@ -6086,7 +6087,7 @@ const commentForMonorepo = ( let report = lcovObj.lcov; if (baseLcov) { - console.log(baseLcov, 'baseLcov on comment compare'); + console.log(baseLcov, "baseLcov on comment compare"); const onlyInLcov = lcovObj.lcov.filter(comparer(baseLcov)); const onlyInBefore = baseLcov.filter(comparer(lcovObj.lcov)); report = onlyInBefore.concat(onlyInLcov); diff --git a/src/comment.js b/src/comment.js index 22bd6026..baa6182c 100644 --- a/src/comment.js +++ b/src/comment.js @@ -38,6 +38,7 @@ const commentForMonorepo = ( ) => { const { base } = options; const html = lcovArrayForMonorepo.map(lcovObj => { + console.log(lcovBaseArrayForMonorepo, "lcovBaseArrayForMonorepo"); const baseLcov = lcovBaseArrayForMonorepo.find( el => el.packageName === lcovObj.packageName, ); From 8e55fd57fdf75e072ba34562195f0a6be1860a6b Mon Sep 17 00:00:00 2001 From: marinakalyuzhnaya Date: Fri, 10 Dec 2021 17:17:40 +0100 Subject: [PATCH 4/9] test --- dist/main.js | 6 +++--- src/comment.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/main.js b/dist/main.js index 5f235880..a59e4d0b 100644 --- a/dist/main.js +++ b/dist/main.js @@ -6056,7 +6056,7 @@ const commentForMonorepo = ( ) => { const { base } = options; const html = lcovArrayForMonorepo.map(lcovObj => { - console.log(lcovBaseArrayForMonorepo, 'lcovBaseArrayForMonorepo'); + console.log(lcovBaseArrayForMonorepo, "lcovBaseArrayForMonorepo"); const baseLcov = lcovBaseArrayForMonorepo.find( el => el.packageName === lcovObj.packageName, ); @@ -6088,8 +6088,8 @@ const commentForMonorepo = ( if (baseLcov) { console.log(baseLcov, "baseLcov on comment compare"); - const onlyInLcov = lcovObj.lcov.filter(comparer(baseLcov)); - const onlyInBefore = baseLcov.filter(comparer(lcovObj.lcov)); + const onlyInLcov = lcovObj.lcov.filter(comparer(baseLcov.lcov)); + const onlyInBefore = baseLcov.lcov.filter(comparer(lcovObj.lcov)); report = onlyInBefore.concat(onlyInLcov); } diff --git a/src/comment.js b/src/comment.js index baa6182c..40b786ee 100644 --- a/src/comment.js +++ b/src/comment.js @@ -70,8 +70,8 @@ const commentForMonorepo = ( if (baseLcov) { console.log(baseLcov, "baseLcov on comment compare"); - const onlyInLcov = lcovObj.lcov.filter(comparer(baseLcov)); - const onlyInBefore = baseLcov.filter(comparer(lcovObj.lcov)); + const onlyInLcov = lcovObj.lcov.filter(comparer(baseLcov.lcov)); + const onlyInBefore = baseLcov.lcov.filter(comparer(lcovObj.lcov)); report = onlyInBefore.concat(onlyInLcov); } From 8281203142b7647d7d6f95440e9cbc6b159a4e52 Mon Sep 17 00:00:00 2001 From: marinakalyuzhnaya Date: Fri, 10 Dec 2021 17:29:53 +0100 Subject: [PATCH 5/9] clean-up --- dist/main.js | 2 -- src/comment.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/dist/main.js b/dist/main.js index a59e4d0b..c9f2ffc8 100644 --- a/dist/main.js +++ b/dist/main.js @@ -6056,7 +6056,6 @@ const commentForMonorepo = ( ) => { const { base } = options; const html = lcovArrayForMonorepo.map(lcovObj => { - console.log(lcovBaseArrayForMonorepo, "lcovBaseArrayForMonorepo"); const baseLcov = lcovBaseArrayForMonorepo.find( el => el.packageName === lcovObj.packageName, ); @@ -6087,7 +6086,6 @@ const commentForMonorepo = ( let report = lcovObj.lcov; if (baseLcov) { - console.log(baseLcov, "baseLcov on comment compare"); const onlyInLcov = lcovObj.lcov.filter(comparer(baseLcov.lcov)); const onlyInBefore = baseLcov.lcov.filter(comparer(lcovObj.lcov)); report = onlyInBefore.concat(onlyInLcov); diff --git a/src/comment.js b/src/comment.js index 40b786ee..e7faf74f 100644 --- a/src/comment.js +++ b/src/comment.js @@ -38,7 +38,6 @@ const commentForMonorepo = ( ) => { const { base } = options; const html = lcovArrayForMonorepo.map(lcovObj => { - console.log(lcovBaseArrayForMonorepo, "lcovBaseArrayForMonorepo"); const baseLcov = lcovBaseArrayForMonorepo.find( el => el.packageName === lcovObj.packageName, ); @@ -69,7 +68,6 @@ const commentForMonorepo = ( let report = lcovObj.lcov; if (baseLcov) { - console.log(baseLcov, "baseLcov on comment compare"); const onlyInLcov = lcovObj.lcov.filter(comparer(baseLcov.lcov)); const onlyInBefore = baseLcov.lcov.filter(comparer(lcovObj.lcov)); report = onlyInBefore.concat(onlyInLcov); From 5b6feda907af6f7986f18961e72604e209468181 Mon Sep 17 00:00:00 2001 From: marinakalyuzhnaya Date: Fri, 10 Dec 2021 17:48:02 +0100 Subject: [PATCH 6/9] clean-up --- dist/main.js | 2 ++ src/index.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dist/main.js b/dist/main.js index c9f2ffc8..1ec08117 100644 --- a/dist/main.js +++ b/dist/main.js @@ -6379,6 +6379,8 @@ const main = async () => { base: context.payload.pull_request.base.ref, appName, }; + + console.log(context.payload, 'context.payload'); const lcov = !monorepoBasePath && (await parse$1(raw)); const baselcov = baseRaw && (await parse$1(baseRaw)); diff --git a/src/index.js b/src/index.js index 009a32de..c35da2ff 100644 --- a/src/index.js +++ b/src/index.js @@ -118,6 +118,8 @@ const main = async () => { appName, }; + console.log(context.payload, "context.payload"); + const lcov = !monorepoBasePath && (await parse(raw)); const baselcov = baseRaw && (await parse(baseRaw)); From 11099f07b6958c1d1a388ca0f1dd813c4cf3c7e7 Mon Sep 17 00:00:00 2001 From: marinakalyuzhnaya Date: Fri, 10 Dec 2021 17:49:56 +0100 Subject: [PATCH 7/9] clean-up --- dist/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/main.js b/dist/main.js index 1ec08117..bf53662a 100644 --- a/dist/main.js +++ b/dist/main.js @@ -6379,8 +6379,8 @@ const main = async () => { base: context.payload.pull_request.base.ref, appName, }; - - console.log(context.payload, 'context.payload'); + + console.log(context.payload, "context.payload"); const lcov = !monorepoBasePath && (await parse$1(raw)); const baselcov = baseRaw && (await parse$1(baseRaw)); From 6d8f686fb887b9616f8264c8ee1484e304a1b6d5 Mon Sep 17 00:00:00 2001 From: marinakalyuzhnaya Date: Fri, 10 Dec 2021 18:03:15 +0100 Subject: [PATCH 8/9] clean-up --- dist/main.js | 2 -- src/index.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/dist/main.js b/dist/main.js index bf53662a..c9f2ffc8 100644 --- a/dist/main.js +++ b/dist/main.js @@ -6380,8 +6380,6 @@ const main = async () => { appName, }; - console.log(context.payload, "context.payload"); - const lcov = !monorepoBasePath && (await parse$1(raw)); const baselcov = baseRaw && (await parse$1(baseRaw)); diff --git a/src/index.js b/src/index.js index c35da2ff..009a32de 100644 --- a/src/index.js +++ b/src/index.js @@ -118,8 +118,6 @@ const main = async () => { appName, }; - console.log(context.payload, "context.payload"); - const lcov = !monorepoBasePath && (await parse(raw)); const baselcov = baseRaw && (await parse(baseRaw)); From 32c421e951331e4bab56e3fdd48c3a3f01a89e6b Mon Sep 17 00:00:00 2001 From: Eesh Tyagi Date: Wed, 18 Jan 2023 19:49:03 +0100 Subject: [PATCH 9/9] node 18 --- .github/workflows/pr-checks.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 817ac1d2..2215dbbc 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -18,7 +18,7 @@ jobs: - name: Setup node uses: actions/setup-node@v1 with: - node-version: 16 + node-version: 18 - name: Restore node_modules cache uses: actions/cache@v2 with: @@ -40,7 +40,7 @@ jobs: - name: Setup node uses: actions/setup-node@v1 with: - node-version: 16 + node-version: 18 - name: Restore node_modules cache uses: actions/cache@v2 with: @@ -67,7 +67,7 @@ jobs: - name: Setup node uses: actions/setup-node@v1 with: - node-version: 16 + node-version: 18 - name: Restore node_modules cache uses: actions/cache@v2 with: