From 171b0f323e3b7034ab80e097d711a628c6dfd106 Mon Sep 17 00:00:00 2001 From: Rushat Gabhane Date: Thu, 18 Apr 2024 01:31:12 +0530 Subject: [PATCH 1/6] add workflow to validate redirects.csv --- .github/workflows/deployExpensifyHelp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deployExpensifyHelp.yml b/.github/workflows/deployExpensifyHelp.yml index d4577e112d597..699bd379fb774 100644 --- a/.github/workflows/deployExpensifyHelp.yml +++ b/.github/workflows/deployExpensifyHelp.yml @@ -36,6 +36,9 @@ jobs: - name: Create docs routes file run: ./.github/scripts/createDocsRoutes.sh + + - name: Check duplicates in redirect.csv + run: ./.github/scripts/verifyRedirect.sh - name: Build with Jekyll uses: actions/jekyll-build-pages@0143c158f4fa0c5dcd99499a5d00859d79f70b0e From 5363920f85cd7c7bc99caeb27e7cc9578112920a Mon Sep 17 00:00:00 2001 From: Rushat Gabhane Date: Thu, 18 Apr 2024 01:31:31 +0530 Subject: [PATCH 2/6] add workflow to validate redirects.csv --- .github/scripts/verifyRedirect.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/scripts/verifyRedirect.sh diff --git a/.github/scripts/verifyRedirect.sh b/.github/scripts/verifyRedirect.sh new file mode 100644 index 0000000000000..6b33a1e549d7d --- /dev/null +++ b/.github/scripts/verifyRedirect.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# HelpDot - Verifies that redirects.csv does not have any duplicates +# Duplicate sourceURLs break redirection on cloudflare pages + +duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' ../../docs/redirects.csv) + +if [[ -z "$duplicates" ]]; then + exit 0 +fi + +echo $duplicates +exit 1 From 719b54fc3243af963b9d12c44e0c39343c1c3cbc Mon Sep 17 00:00:00 2001 From: Rushat Gabhane Date: Thu, 18 Apr 2024 01:40:17 +0530 Subject: [PATCH 3/6] add workflow to validate redirects.csv --- .github/scripts/verifyRedirect.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/verifyRedirect.sh b/.github/scripts/verifyRedirect.sh index 6b33a1e549d7d..89f3ea8dc8bb7 100644 --- a/.github/scripts/verifyRedirect.sh +++ b/.github/scripts/verifyRedirect.sh @@ -3,7 +3,7 @@ # HelpDot - Verifies that redirects.csv does not have any duplicates # Duplicate sourceURLs break redirection on cloudflare pages -duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' ../../docs/redirects.csv) +duplicates=$(awk -F, 'a[$1]++{print "duplicate sourceURLs are not allowed: " $1}' ../../docs/redirects.csv) if [[ -z "$duplicates" ]]; then exit 0 From f785d1774439a80a1ee812815f72f395da0756fd Mon Sep 17 00:00:00 2001 From: Rushat Gabhane Date: Thu, 18 Apr 2024 01:51:30 +0530 Subject: [PATCH 4/6] fix path --- .github/scripts/verifyRedirect.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/verifyRedirect.sh b/.github/scripts/verifyRedirect.sh index 89f3ea8dc8bb7..800f8d86f73d7 100644 --- a/.github/scripts/verifyRedirect.sh +++ b/.github/scripts/verifyRedirect.sh @@ -3,7 +3,7 @@ # HelpDot - Verifies that redirects.csv does not have any duplicates # Duplicate sourceURLs break redirection on cloudflare pages -duplicates=$(awk -F, 'a[$1]++{print "duplicate sourceURLs are not allowed: " $1}' ../../docs/redirects.csv) +duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' docs/redirects.csv) if [[ -z "$duplicates" ]]; then exit 0 From 99ee30dc265e50cadf184cbdf03d26f40a64537c Mon Sep 17 00:00:00 2001 From: Rushat Gabhane Date: Thu, 18 Apr 2024 01:52:28 +0530 Subject: [PATCH 5/6] ready only --- .github/scripts/verifyRedirect.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/scripts/verifyRedirect.sh b/.github/scripts/verifyRedirect.sh index 800f8d86f73d7..9d8e19d0128f4 100644 --- a/.github/scripts/verifyRedirect.sh +++ b/.github/scripts/verifyRedirect.sh @@ -3,7 +3,9 @@ # HelpDot - Verifies that redirects.csv does not have any duplicates # Duplicate sourceURLs break redirection on cloudflare pages -duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' docs/redirects.csv) +declare -r REDIRECTS_FILE="docs/redirects.csv" + +duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' $REDIRECTS_FILE) if [[ -z "$duplicates" ]]; then exit 0 From 02a3b824db255f5fd4a1fdebd9a14b8fb3940f39 Mon Sep 17 00:00:00 2001 From: Rushat Gabhane Date: Thu, 18 Apr 2024 01:55:05 +0530 Subject: [PATCH 6/6] err msg --- .github/scripts/verifyRedirect.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/verifyRedirect.sh b/.github/scripts/verifyRedirect.sh index 9d8e19d0128f4..737d9bffacf9c 100644 --- a/.github/scripts/verifyRedirect.sh +++ b/.github/scripts/verifyRedirect.sh @@ -5,11 +5,11 @@ declare -r REDIRECTS_FILE="docs/redirects.csv" -duplicates=$(awk -F, 'a[$1]++{print "duplicate redirects are not allowed: " $1}' $REDIRECTS_FILE) +duplicates=$(awk -F, 'a[$1]++{print $1}' $REDIRECTS_FILE) if [[ -z "$duplicates" ]]; then exit 0 fi -echo $duplicates +echo "duplicate redirects are not allowed: $duplicates" exit 1