From b451b6d3071723bf92b23bec9fbc0c90e08cfc3d Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 08:39:12 -0400 Subject: [PATCH 01/21] Test pr on code dupe --- modules/mediafuseBidAdapter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mediafuseBidAdapter.js b/modules/mediafuseBidAdapter.js index d969314f406..c7e31198673 100644 --- a/modules/mediafuseBidAdapter.js +++ b/modules/mediafuseBidAdapter.js @@ -1036,7 +1036,7 @@ function hideSASIframe(elementId) { function outstreamRender(bid) { hidedfpContainer(bid.adUnitCode); hideSASIframe(bid.adUnitCode); - // push to render queue because ANOutstreamVideo may not be loaded yet + // push to render queue because ANOutstreamVideo may not be loaded bid.renderer.push(() => { window.ANOutstreamVideo.renderAd({ tagId: bid.adResponse.tag_id, From ca071142e7f1e3eecdc50f950d272bea8d3818d6 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 08:44:40 -0400 Subject: [PATCH 02/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index c89fedf8c51..23546ec71bb 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -34,7 +34,7 @@ jobs: - name: Run jscpd on changed files run: | if [ -s js_files.txt ]; then - jscpd --files $(cat js_files.txt | tr '\n' ',') --threshold 1 --min-tokens 50 --reporters json --output jscpd-report.json + jscpd $(cat js_files.txt | tr '\n' ',') --threshold 1 --min-tokens 50 --reporters json --output jscpd-report.json else echo '{}' > jscpd-report.json fi From 17e047d9ff5e42e7751e39aab8054d93d47c8363 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 08:51:22 -0400 Subject: [PATCH 03/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 23546ec71bb..dededc0514f 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -34,7 +34,7 @@ jobs: - name: Run jscpd on changed files run: | if [ -s js_files.txt ]; then - jscpd $(cat js_files.txt | tr '\n' ',') --threshold 1 --min-tokens 50 --reporters json --output jscpd-report.json + jscpd $(cat js_files.txt | tr '\n' ' ') --threshold 1 --min-tokens 50 --reporters json --output jscpd-report.json else echo '{}' > jscpd-report.json fi From 48beab132be63f16cda6cd09a7cd07d48e9bd6de Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 08:54:50 -0400 Subject: [PATCH 04/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index dededc0514f..0258d207ae5 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -39,6 +39,9 @@ jobs: echo '{}' > jscpd-report.json fi + - name: List generated files (debug) + run: ls -l + - name: Upload jscpd report if: always() uses: actions/upload-artifact@v3 @@ -46,9 +49,13 @@ jobs: name: jscpd-report path: jscpd-report.json - - name: Parse jscpd report and post comment - id: post-comment + - name: Parse jscpd report and set output + id: parse-report run: | + if [ ! -f jscpd-report.json ]; then + echo "jscpd-report.json not found" + exit 1 + fi DUPLICATIONS=$(jq '.duplicates | length' jscpd-report.json) if [ "$DUPLICATIONS" -gt 0 ]; then COMMENT="Found $DUPLICATIONS duplications in the codebase:\n\n" @@ -57,6 +64,8 @@ jobs: echo "$COMMENT" >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV exit 1 + else + echo "No duplications found." fi - name: Post GitHub comment From a56d7e6f066c51be1605fdaa7492c7e973403ce8 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:01:04 -0400 Subject: [PATCH 05/21] Update jscpd.yml From 04e2fec90095214744cb83d44137a61e71c5b523 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:02:37 -0400 Subject: [PATCH 06/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 0258d207ae5..5ce834bcede 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -27,10 +27,16 @@ jobs: - name: Get the diff run: git diff origin/master...HEAD --name-only > changed_files.txt + - name: Display changed files (debug) + run: cat changed_files.txt + - name: Filter JavaScript files run: | grep -E '\.js$' changed_files.txt > js_files.txt || true + - name: Display JavaScript files (debug) + run: cat js_files.txt + - name: Run jscpd on changed files run: | if [ -s js_files.txt ]; then @@ -42,6 +48,9 @@ jobs: - name: List generated files (debug) run: ls -l + - name: Display jscpd report content (debug) + run: cat jscpd-report.json || echo "jscpd-report.json not found or empty" + - name: Upload jscpd report if: always() uses: actions/upload-artifact@v3 From d06c7cfa1b1f09d16fa6a7a946409cac3162fd45 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:05:48 -0400 Subject: [PATCH 07/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 5ce834bcede..96bd08411d4 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -24,40 +24,20 @@ jobs: run: | npm install -g jscpd diff-so-fancy + - name: Run jscpd on entire codebase + run: | + jscpd --threshold 1 --min-tokens 50 --reporters json --output jscpd-report.json + - name: Get the diff run: git diff origin/master...HEAD --name-only > changed_files.txt - - name: Display changed files (debug) - run: cat changed_files.txt - - name: Filter JavaScript files run: | grep -E '\.js$' changed_files.txt > js_files.txt || true - - name: Display JavaScript files (debug) - run: cat js_files.txt - - - name: Run jscpd on changed files - run: | - if [ -s js_files.txt ]; then - jscpd $(cat js_files.txt | tr '\n' ' ') --threshold 1 --min-tokens 50 --reporters json --output jscpd-report.json - else - echo '{}' > jscpd-report.json - fi - - name: List generated files (debug) run: ls -l - - name: Display jscpd report content (debug) - run: cat jscpd-report.json || echo "jscpd-report.json not found or empty" - - - name: Upload jscpd report - if: always() - uses: actions/upload-artifact@v3 - with: - name: jscpd-report - path: jscpd-report.json - - name: Parse jscpd report and set output id: parse-report run: | @@ -68,7 +48,13 @@ jobs: DUPLICATIONS=$(jq '.duplicates | length' jscpd-report.json) if [ "$DUPLICATIONS" -gt 0 ]; then COMMENT="Found $DUPLICATIONS duplications in the codebase:\n\n" - COMMENT+=$(jq -r '.duplicates[] | "- `\(.firstFile):\(.lines[0])-\(.lines[1])` duplicated in `\(.secondFile):\(.lines[0])-\(.lines[1])`"' jscpd-report.json) + while read -r file; do + COMMENT+=$(jq -r --arg file "$file" '.duplicates[] | select(.firstFile == $file or .secondFile == $file) | "- `\(.firstFile):\(.lines[0])-\(.lines[1])` duplicated in `\(.secondFile):\(.lines[0])-\(.lines[1])`"' jscpd-report.json) + done < js_files.txt + if [ -z "$COMMENT" ]; then + echo "No duplications found in changed files." + exit 0 + fi echo "comment<> $GITHUB_ENV echo "$COMMENT" >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV From feabd73fe06fa81840d52704025eb6d93edbdec9 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:10:38 -0400 Subject: [PATCH 08/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 96bd08411d4..02ce73b6d61 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -26,14 +26,14 @@ jobs: - name: Run jscpd on entire codebase run: | - jscpd --threshold 1 --min-tokens 50 --reporters json --output jscpd-report.json + jscpd --threshold 20 --min-tokens 50 --reporters json --output jscpd-report.json --exclude "**/*spec.js" - name: Get the diff run: git diff origin/master...HEAD --name-only > changed_files.txt - name: Filter JavaScript files run: | - grep -E '\.js$' changed_files.txt > js_files.txt || true + grep -E '\.js$' changed_files.txt | grep -v 'spec.js' > js_files.txt || true - name: List generated files (debug) run: ls -l From e6f75accdc58566052b208f08752e9f64f43c716 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:14:23 -0400 Subject: [PATCH 09/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 02ce73b6d61..8bcae090db1 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -24,9 +24,22 @@ jobs: run: | npm install -g jscpd diff-so-fancy - - name: Run jscpd on entire codebase + - name: Create jscpd config file run: | - jscpd --threshold 20 --min-tokens 50 --reporters json --output jscpd-report.json --exclude "**/*spec.js" + echo '{ + "threshold": 20, + "minTokens": 50, + "reporters": [ + "json" + ], + "output": "jscpd-report.json", + "exclude": [ + "**/*spec.js" + ] + }' > .jscpd.json + + - name: Run jscpd on entire codebase + run: jscpd - name: Get the diff run: git diff origin/master...HEAD --name-only > changed_files.txt From fb6b6502d5a4231b3302bf957685fb8091488fe2 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:21:09 -0400 Subject: [PATCH 10/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 8bcae090db1..ce13f91be12 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -33,8 +33,9 @@ jobs: "json" ], "output": "jscpd-report.json", - "exclude": [ - "**/*spec.js" + "patterns": [ + "**/*.js", + "!**/*spec.js" ] }' > .jscpd.json From 32f60d93a59dca527c34d98ba0f1fd7eb1ceef49 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:21:57 -0400 Subject: [PATCH 11/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index ce13f91be12..d82c4b2762a 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -47,7 +47,7 @@ jobs: - name: Filter JavaScript files run: | - grep -E '\.js$' changed_files.txt | grep -v 'spec.js' > js_files.txt || true + grep -E '\.js$' changed_files.txt > js_files.txt || true - name: List generated files (debug) run: ls -l From 4eb7628726b90bfe187f6aa1e6e23b263d33e2ee Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:25:06 -0400 Subject: [PATCH 12/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index d82c4b2762a..58a672723f8 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -33,10 +33,9 @@ jobs: "json" ], "output": "jscpd-report.json", - "patterns": [ - "**/*.js", - "!**/*spec.js" - ] + "pattern": "**/*.js", + "ignore": "**/*spec.js" + }' > .jscpd.json - name: Run jscpd on entire codebase From 71c10c4176147f1887dd27ecf058b4e2ae8cf3d9 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:25:23 -0400 Subject: [PATCH 13/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 58a672723f8..8c3ea81c31d 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -34,8 +34,7 @@ jobs: ], "output": "jscpd-report.json", "pattern": "**/*.js", - "ignore": "**/*spec.js" - + "ignore": "**/*spec.js" }' > .jscpd.json - name: Run jscpd on entire codebase From 1fbbe3e789813fced4e174d36254051677739a6c Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:28:56 -0400 Subject: [PATCH 14/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 8c3ea81c31d..d5f4bc80079 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -40,13 +40,6 @@ jobs: - name: Run jscpd on entire codebase run: jscpd - - name: Get the diff - run: git diff origin/master...HEAD --name-only > changed_files.txt - - - name: Filter JavaScript files - run: | - grep -E '\.js$' changed_files.txt > js_files.txt || true - - name: List generated files (debug) run: ls -l From 42bf93367f7577ce7df0bb2264728035858ecf6c Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:31:53 -0400 Subject: [PATCH 15/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index d5f4bc80079..ebf68571862 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -46,11 +46,11 @@ jobs: - name: Parse jscpd report and set output id: parse-report run: | - if [ ! -f jscpd-report.json ]; then + if [ ! -f ./jscpd-report.json/jscpd-report.json ]; then echo "jscpd-report.json not found" exit 1 fi - DUPLICATIONS=$(jq '.duplicates | length' jscpd-report.json) + DUPLICATIONS=$(jq '.duplicates | length' ./jscpd-report.json/jscpd-report.json) if [ "$DUPLICATIONS" -gt 0 ]; then COMMENT="Found $DUPLICATIONS duplications in the codebase:\n\n" while read -r file; do From 18cae7b70bde7a7ca19217f57d5fd688cc268533 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:34:28 -0400 Subject: [PATCH 16/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index ebf68571862..2e896defc8e 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -40,6 +40,13 @@ jobs: - name: Run jscpd on entire codebase run: jscpd + - name: Get the diff + run: git diff origin/master...HEAD --name-only > changed_files.txt + + - name: Filter JavaScript files + run: | + grep -E '\.js$' changed_files.txt | grep -v 'spec.js' > js_files.txt || true + - name: List generated files (debug) run: ls -l @@ -54,7 +61,7 @@ jobs: if [ "$DUPLICATIONS" -gt 0 ]; then COMMENT="Found $DUPLICATIONS duplications in the codebase:\n\n" while read -r file; do - COMMENT+=$(jq -r --arg file "$file" '.duplicates[] | select(.firstFile == $file or .secondFile == $file) | "- `\(.firstFile):\(.lines[0])-\(.lines[1])` duplicated in `\(.secondFile):\(.lines[0])-\(.lines[1])`"' jscpd-report.json) + COMMENT+=$(jq -r --arg file "$file" '.duplicates[] | select(.firstFile == $file or .secondFile == $file) | "- `\(.firstFile):\(.lines[0])-\(.lines[1])` duplicated in `\(.secondFile):\(.lines[0])-\(.lines[1])`"' ./jscpd-report.json/jscpd-report.json) done < js_files.txt if [ -z "$COMMENT" ]; then echo "No duplications found in changed files." From ebe13201845ab62169275601f236abc1cad51369 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:38:28 -0400 Subject: [PATCH 17/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 2e896defc8e..70559675861 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -32,7 +32,7 @@ jobs: "reporters": [ "json" ], - "output": "jscpd-report.json", + "output": "./", "pattern": "**/*.js", "ignore": "**/*spec.js" }' > .jscpd.json @@ -53,15 +53,15 @@ jobs: - name: Parse jscpd report and set output id: parse-report run: | - if [ ! -f ./jscpd-report.json/jscpd-report.json ]; then + if [ ! -f ./jscpd-report.json ]; then echo "jscpd-report.json not found" exit 1 fi - DUPLICATIONS=$(jq '.duplicates | length' ./jscpd-report.json/jscpd-report.json) + DUPLICATIONS=$(jq '.duplicates | length' ./jscpd-report.json) if [ "$DUPLICATIONS" -gt 0 ]; then COMMENT="Found $DUPLICATIONS duplications in the codebase:\n\n" while read -r file; do - COMMENT+=$(jq -r --arg file "$file" '.duplicates[] | select(.firstFile == $file or .secondFile == $file) | "- `\(.firstFile):\(.lines[0])-\(.lines[1])` duplicated in `\(.secondFile):\(.lines[0])-\(.lines[1])`"' ./jscpd-report.json/jscpd-report.json) + COMMENT+=$(jq -r --arg file "$file" '.duplicates[] | select(.firstFile == $file or .secondFile == $file) | "- `\(.firstFile):\(.lines[0])-\(.lines[1])` duplicated in `\(.secondFile):\(.lines[0])-\(.lines[1])`"' ./jscpd-report.json) done < js_files.txt if [ -z "$COMMENT" ]; then echo "No duplications found in changed files." @@ -74,15 +74,3 @@ jobs: else echo "No duplications found." fi - - - name: Post GitHub comment - if: failure() - uses: actions/github-script@v6 - with: - script: | - github.rest.issues.createComment({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: context.issue.number, - body: process.env.comment - }) From a8327e6137e8b30e63f21dbddeab8a2c29b67a3b Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:42:13 -0400 Subject: [PATCH 18/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 70559675861..47d6eef4528 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -50,27 +50,12 @@ jobs: - name: List generated files (debug) run: ls -l - - name: Parse jscpd report and set output - id: parse-report + - name: Filter jscpd report for changed files run: | if [ ! -f ./jscpd-report.json ]; then echo "jscpd-report.json not found" exit 1 fi - DUPLICATIONS=$(jq '.duplicates | length' ./jscpd-report.json) - if [ "$DUPLICATIONS" -gt 0 ]; then - COMMENT="Found $DUPLICATIONS duplications in the codebase:\n\n" - while read -r file; do - COMMENT+=$(jq -r --arg file "$file" '.duplicates[] | select(.firstFile == $file or .secondFile == $file) | "- `\(.firstFile):\(.lines[0])-\(.lines[1])` duplicated in `\(.secondFile):\(.lines[0])-\(.lines[1])`"' ./jscpd-report.json) - done < js_files.txt - if [ -z "$COMMENT" ]; then - echo "No duplications found in changed files." - exit 0 - fi - echo "comment<> $GITHUB_ENV - echo "$COMMENT" >> $GITHUB_ENV - echo "EOF" >> $GITHUB_ENV - exit 1 - else - echo "No duplications found." - fi + echo "Filtering jscpd report for changed files..." + jq -r '.duplicates[] | select(.firstFile as $file | $file | index(inputs)) or select(.secondFile as $file | $file | index(inputs))' ./jscpd-report.json js_files.txt > filtered-jscpd-report.json + cat filtered-jscpd-report.json From 3fa5e35b7ec7e9bf0fcce005fd17a93f0160c3f4 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:46:30 -0400 Subject: [PATCH 19/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 47d6eef4528..0d3907ec553 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -50,6 +50,13 @@ jobs: - name: List generated files (debug) run: ls -l + - name: Upload unfiltered jscpd report + if: always() + uses: actions/upload-artifact@v3 + with: + name: unfiltered-jscpd-report + path: ./jscpd-report.json + - name: Filter jscpd report for changed files run: | if [ ! -f ./jscpd-report.json ]; then @@ -57,5 +64,6 @@ jobs: exit 1 fi echo "Filtering jscpd report for changed files..." - jq -r '.duplicates[] | select(.firstFile as $file | $file | index(inputs)) or select(.secondFile as $file | $file | index(inputs))' ./jscpd-report.json js_files.txt > filtered-jscpd-report.json + CHANGED_FILES=$(cat js_files.txt | jq -R -s -c 'split("\n")[:-1]') + jq --argjson changed_files "$CHANGED_FILES" '.duplicates[] | select(.firstFile as $file | $changed_files | index($file) or .secondFile as $file | $changed_files | index($file))' ./jscpd-report.json > filtered-jscpd-report.json cat filtered-jscpd-report.json From e3a26d97e928523622ca38b13a513120e9d51751 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:51:46 -0400 Subject: [PATCH 20/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 0d3907ec553..6f0f1f44b76 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -64,6 +64,6 @@ jobs: exit 1 fi echo "Filtering jscpd report for changed files..." - CHANGED_FILES=$(cat js_files.txt | jq -R -s -c 'split("\n")[:-1]') - jq --argjson changed_files "$CHANGED_FILES" '.duplicates[] | select(.firstFile as $file | $changed_files | index($file) or .secondFile as $file | $changed_files | index($file))' ./jscpd-report.json > filtered-jscpd-report.json + CHANGED_FILES=$(jq -R -s -c 'split("\n")[:-1]' js_files.txt) + jq --argjson changed_files "$CHANGED_FILES" '.duplicates | map(select($changed_files | index(.firstFile) or $changed_files | index(.secondFile)))' ./jscpd-report.json > filtered-jscpd-report.json cat filtered-jscpd-report.json From 1d059bedea5e659d1b9cc7dc62f9ef7761db773d Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Sat, 8 Jun 2024 09:54:14 -0400 Subject: [PATCH 21/21] Update jscpd.yml --- .github/workflows/jscpd.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/jscpd.yml b/.github/workflows/jscpd.yml index 6f0f1f44b76..d3a2de26f11 100644 --- a/.github/workflows/jscpd.yml +++ b/.github/workflows/jscpd.yml @@ -56,14 +56,3 @@ jobs: with: name: unfiltered-jscpd-report path: ./jscpd-report.json - - - name: Filter jscpd report for changed files - run: | - if [ ! -f ./jscpd-report.json ]; then - echo "jscpd-report.json not found" - exit 1 - fi - echo "Filtering jscpd report for changed files..." - CHANGED_FILES=$(jq -R -s -c 'split("\n")[:-1]' js_files.txt) - jq --argjson changed_files "$CHANGED_FILES" '.duplicates | map(select($changed_files | index(.firstFile) or $changed_files | index(.secondFile)))' ./jscpd-report.json > filtered-jscpd-report.json - cat filtered-jscpd-report.json