From 8d70f45a4f70c5772f9a0f325567209523af6b01 Mon Sep 17 00:00:00 2001 From: l-Aad-l <7024626+l-Aad-l@users.noreply.github.com> Date: Sat, 28 Jan 2023 12:01:54 -0500 Subject: [PATCH 1/3] Updates - Added whitelist.tf validation bash script - Testing whitelist.tf validation on branch builds --- .github/workflows/main.yml | 28 +++++++++++++++++++++++++++ build_tools/whitelisttf_validation.sh | 28 +++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 build_tools/whitelisttf_validation.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0552457..f397872 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -79,6 +79,34 @@ jobs: wget -q -O rgl_whitelist_mm.txt https://whitelist.tf/rgl_nr6s.txt wget -q -O rgl_whitelist_7s.txt https://whitelist.tf/rgl_7v7.txt working-directory: ${{ env.CONFIG_PATH }}/ + + - name: Validate whitelists for each format + run: | + sixes_lines=$(wc -l < rgl_whitelist_6s.txt) + hl_lines=$(wc -l < rgl_whitelist_HL.txt) + mm_lines=$(wc -l < rgl_whitelist_mm.txt) + pl_lines=$(wc -l < rgl_whitelist_7s.txt) + sixes_lines=$(wc -l < rgl_whitelist_6s.txt) + if [[ $sixes_lines -le 50 ]]; + then + echo "Sixes: Number of lines is less than 50." + exit 1 + elif [[ $hl_lines -le 50 ]] + then + echo "HL: Number of lines is less than 50." + exit 1 + elif [[ $mm_lines -le 50 ]] + then + echo "MM: Number of lines is less than 50." + exit 1 + elif [[ $pl_lines -le 50 ]] + then + echo "PL: Number of lines is less than 50." + exit 1 + fi + + echo "Whitelist Checks Complete" + working-directory: ${{ env.CONFIG_PATH }}/ - name: Setup SourcePawn Compiler ${{ matrix.SM_VERSION }} id: setup-sp diff --git a/build_tools/whitelisttf_validation.sh b/build_tools/whitelisttf_validation.sh new file mode 100644 index 0000000..f87a0fb --- /dev/null +++ b/build_tools/whitelisttf_validation.sh @@ -0,0 +1,28 @@ +wget -q -O rgl_whitelist_6s.txt https://whitelist.tf/rgl_6v6.txt +wget -q -O rgl_whitelist_HL.txt https://whitelist.tf/rgl_9v9.txt +wget -q -O rgl_whitelist_mm.txt https://whitelist.tf/rgl_nr6s.txt +wget -q -O rgl_whitelist_7s.txt https://whitelist.tf/rgl_7v7.txt +sixes_lines=$(wc -l < rgl_whitelist_6s.txt) +hl_lines=$(wc -l < rgl_whitelist_HL.txt) +mm_lines=$(wc -l < rgl_whitelist_mm.txt) +pl_lines=$(wc -l < rgl_whitelist_7s.txt) +sixes_lines=$(wc -l < rgl_whitelist_6s.txt) +if [[ $sixes_lines -le 50 ]]; +then + echo "Sixes: Number of lines is less than 50." + exit 1 +elif [[ $hl_lines -le 50 ]] +then + echo "HL: Number of lines is less than 50." + exit 1 +elif [[ $mm_lines -le 50 ]] +then + echo "MM: Number of lines is less than 50." + exit 1 +elif [[ $pl_lines -le 50 ]] +then + echo "PL: Number of lines is less than 50." + exit 1 +fi + +echo "Whitelist Checks Complete" \ No newline at end of file From c3c96d86535b7906ae59a5b07839653748ea1058 Mon Sep 17 00:00:00 2001 From: l-Aad-l <7024626+l-Aad-l@users.noreply.github.com> Date: Sat, 28 Jan 2023 12:03:37 -0500 Subject: [PATCH 2/3] Github actions failure test --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f397872..1680ea5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -87,9 +87,9 @@ jobs: mm_lines=$(wc -l < rgl_whitelist_mm.txt) pl_lines=$(wc -l < rgl_whitelist_7s.txt) sixes_lines=$(wc -l < rgl_whitelist_6s.txt) - if [[ $sixes_lines -le 50 ]]; + if [[ $sixes_lines -le 5000 ]]; then - echo "Sixes: Number of lines is less than 50." + echo "Sixes: Number of lines is less than 5000." exit 1 elif [[ $hl_lines -le 50 ]] then From 73a3b13af19620f81cc155a08f76ebae10891835 Mon Sep 17 00:00:00 2001 From: l-Aad-l <7024626+l-Aad-l@users.noreply.github.com> Date: Sat, 28 Jan 2023 12:04:42 -0500 Subject: [PATCH 3/3] Whitelist.tf validation complete --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1680ea5..f397872 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -87,9 +87,9 @@ jobs: mm_lines=$(wc -l < rgl_whitelist_mm.txt) pl_lines=$(wc -l < rgl_whitelist_7s.txt) sixes_lines=$(wc -l < rgl_whitelist_6s.txt) - if [[ $sixes_lines -le 5000 ]]; + if [[ $sixes_lines -le 50 ]]; then - echo "Sixes: Number of lines is less than 5000." + echo "Sixes: Number of lines is less than 50." exit 1 elif [[ $hl_lines -le 50 ]] then