Clean scripts and workflows

Author: Alvaro Muñoz

.github/scripts/pr-compile.sh

@@ -7,10 +7,7 @@ LANGUAGE=${2}
 LIBRARY_SCANNED=false
 
 echo "[+] Compiling all queries in $LANGUAGE"
-gh codeql query compile \
-    --threads=0 --check-only \
-    "./$LANGUAGE/"
-    # --search-path=./codeql --additional-packs=./codeql:./codeql/misc \
+gh codeql query compile --threads=0 --check-only "./$LANGUAGE/"
 
 for file in $(gh pr view "$PR_NUMBER" --json files --jq '.files.[].path'); do
     if [[ ! -f "$file" ]]; then
@@ -22,20 +19,12 @@ for file in $(gh pr view "$PR_NUMBER" --json files --jq '.files.[].path'); do
         echo "[+] Compiling $file (in $LANGUAGE)"
 
         # compile the query
-        gh codeql query compile  \
-            --threads=0 --check-only \
-            --warnings=error \
-            "./$file"
-            # --search-path=./codeql --additional-packs=./codeql:./codeql/misc \
+        gh codeql query compile --threads=0 --check-only --warnings=error "./$file"
 
     # if lib folder is modified
     elif [[ "$file" == $LANGUAGE/lib/* ]] && [[ $LIBRARY_SCANNED == false ]]; then
         echo "[+] Libray changed, compiling all queries in $LANGUAGE"
-        gh codeql query compile \
-            --threads=0 --check-only \
-            --warnings=error \
-            "./$LANGUAGE/"
-            # --search-path=./codeql --additional-packs=./codeql:./codeql/misc \
+        gh codeql query compile --threads=0 --check-only --warnings=error "./$LANGUAGE/"
         # set LIBRARY_SCANNED to true to prevent recompiling
         LIBRARY_SCANNED=true
 

.github/scripts/pr-suites-packs.sh

@@ -14,8 +14,6 @@ for file in $(gh pr view "$PR_NUMBER" --json files --jq '.files.[].path'); do
     if [[ "$file" == $LANGUAGE/suites/**.qls ]]; then
         echo "[+] Compiling Suite: $file"
         gh codeql resolve queries "$file"
-        # --search-path=./codeql \
-        # --additional-packs=./codeql:./codeql/misc \
 
     # qlpack file and lock file
     elif [[ "$file" == $LANGUAGE/qlpack.yml ]] || [[ "$file" == $LANGUAGE/codeql-pack.lock.yml ]]; then

.github/scripts/pr-tests.sh

@@ -11,7 +11,6 @@ fi
 
 echo "[+] Compiling all queries in $LANGUAGE"
 gh codeql query compile --threads=0 --check-only "./$LANGUAGE/"
-    # --search-path=./codeql --additional-packs=./codeql:./codeql/misc \
 
 for file in $(gh pr view "$PR_NUMBER" --json files --jq '.files.[].path'); do
     if [[ ! -f "$file" ]]; then
@@ -24,7 +23,6 @@ for file in $(gh pr view "$PR_NUMBER" --json files --jq '.files.[].path'); do
         TEST_DIR=$(dirname "$file")
         # run tests in the folder the change occured in
         gh codeql test run "$TEST_DIR"
-        # --additional-packs=./ --additional-packs=./codeql \
 
     # if the files is a query file .ql or .qll
     elif [[ "$file" == $LANGUAGE/**.ql ]] || [[ "$file" == $LANGUAGE/**.qll ]] ; then
@@ -36,7 +34,6 @@ for file in $(gh pr view "$PR_NUMBER" --json files --jq '.files.[].path'); do
         if [[ -d "$TEST_DIR" ]]; then
             echo "[+] Running tests for $file -> $TEST_DIR"
             gh codeql test run "$TEST_DIR"
-            # --additional-packs=./ --additional-packs=./codeql \
 
         else
             echo "[!] No tests found at $TEST_DIR"
@@ -49,7 +46,6 @@ for file in $(gh pr view "$PR_NUMBER" --json files --jq '.files.[].path'); do
         if [[ -d "$TEST_DIR" ]]; then
             echo "[+] Running tests for $file -> $TEST_DIR"
             gh codeql test run "$TEST_DIR"
-            # --additional-packs=./ --additional-packs=./codeql \
         else
             echo "[!] No tests found for $file (in $LANGUAGE)"
         fi

.github/workflows/build.yml

@@ -33,7 +33,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: |
-          # gh repo clone github/codeql
           gh extension install github/gh-codeql
           gh codeql pack download "codeql/${{ matrix.language }}-queries"
           gh codeql pack install "${{ matrix.language }}/lib"