From 73801241d44b989b6826570c3e19bac86d6a0e2e Mon Sep 17 00:00:00 2001
From: Adan Aamir <adanaamir2005@gmail.com>
Date: Mon, 22 Jun 2026 19:39:45 +0500
Subject: [PATCH 1/2] Fix #6259: Add failure tracking to static_checks.sh

---
 scripts/static_checks.sh | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/scripts/static_checks.sh b/scripts/static_checks.sh
index 927019d69b5..0c5650ffda5 100644
--- a/scripts/static_checks.sh
+++ b/scripts/static_checks.sh
@@ -12,15 +12,16 @@
 
 # LINT CHECKS
 # Run Java lint check
-bash scripts/checkstyle_lint_check.sh
+FAILURES=0
+bash scripts/checkstyle_lint_check.sh || FAILURES=$((FAILURES+1))
 echo ""
 
 # Run Kotlin lint check
-bash scripts/ktlint_lint_check.sh
+bash scripts/ktlint_lint_check.sh || FAILURES=$((FAILURES+1))
 echo ""
 
 # Run protobuf lint checks
-bash scripts/buf_lint_check.sh
+bash scripts/buf_lint_check.sh || FAILURES=$((FAILURES+1))
 echo ""
 
 # Download Buildifier in oppia-android-tools folder (pre-requisite for buildifier checks)
@@ -33,7 +34,7 @@ cd ../oppia-android/
 echo ""
 
 # Run Bazel Build file lint checks (buildifier checks)
-bash scripts/buildifier_lint_check.sh
+bash scripts/buildifier_lint_check.sh || FAILURES=$((FAILURES+1))
 echo ""
 
 
@@ -44,52 +45,51 @@ echo ""
 echo "********************************"
 echo "Running regex pattern checks"
 echo "********************************"
-bazel run //scripts:regex_pattern_validation_check -- $(pwd)
+bazel run //scripts:regex_pattern_validation_check -- $(pwd) || FAILURES=$((FAILURES+1))
 echo ""
 
 # Run XML Syntax check validation
 echo "********************************"
 echo "Running XML Syntax validation checks"
 echo "********************************"
-bazel run //scripts:xml_syntax_check -- $(pwd)
+bazel run //scripts:xml_syntax_check -- $(pwd) || FAILURES=$((FAILURES+1))
 echo ""
 
 # Run TextView Style check
 echo "********************************"
 echo "Running TextView style validation checks"
 echo "********************************"
-bazel run //scripts:check_textview_styles -- $(pwd)
+bazel run //scripts:check_textview_styles -- $(pwd) || FAILURES=$((FAILURES+1))
 echo ""
 
 # Run Testfile Presence Check
 echo "********************************"
 echo "Running Testfile presence checks"
 echo "********************************"
-bazel run //scripts:test_file_check -- $(pwd)
+bazel run //scripts:test_file_check -- $(pwd) || FAILURES=$((FAILURES+1))
 echo ""
 
 # Run Accessibility label Check
 echo "********************************"
 echo "Running Accessibility label checks"
 echo "********************************"
-bazel run //scripts:accessibility_label_check -- $(pwd) scripts/assets/accessibility_label_exemptions.pb app/src/main/AndroidManifest.xml
+bazel run //scripts:accessibility_label_check -- $(pwd) scripts/assets/accessibility_label_exemptions.pb app/src/main/AndroidManifest.xml || FAILURES=$((FAILURES+1))
 echo ""
 
 # Run KDoc Validation Check
 echo "********************************"
 echo "Running KDoc validation checks"
 echo "********************************"
-bazel run //scripts:kdoc_validity_check -- $(pwd) scripts/assets/kdoc_validity_exemptions.pb
+bazel run //scripts:kdoc_validity_check -- $(pwd) scripts/assets/kdoc_validity_exemptions.pb || FAILURES=$((FAILURES+1))
 echo ""
 
 # Run String resource validation check
 echo "********************************"
 echo "Running resource validation checks"
 echo "********************************"
-bazel run //scripts:string_resource_validation_check -- $(pwd)
+bazel run //scripts:string_resource_validation_check -- $(pwd) || FAILURES=$((FAILURES+1))
 echo ""
 
-
 # THIRD PARTY DEPENDENCY CHECKS
 # These are checks for third party dependencies
 
@@ -97,26 +97,34 @@ echo ""
 echo "********************************"
 echo "Running Maven repin checks"
 echo "********************************"
-REPIN=1 bazel run @unpinned_maven//:pin
+REPIN=1 bazel run @unpinned_maven//:pin || FAILURES=$((FAILURES+1))
 echo ""
 
 # Maven Dependencies Update Check
 echo "********************************"
 echo "Running maven dependencies update checks"
 echo "********************************"
-bazel run //scripts:maven_dependencies_list_check -- $(pwd) third_party/maven_install.json scripts/assets/maven_dependencies.pb
+bazel run //scripts:maven_dependencies_list_check -- $(pwd) third_party/maven_install.json scripts/assets/maven_dependencies.pb || FAILURES=$((FAILURES+1))
 echo ""
 
 # License Texts Check
 echo "********************************"
 echo "Running license texts checks"
 echo "********************************"
-bazel run //scripts:license_texts_check -- $(pwd)/app/src/main/res/values/third_party_dependencies.xml
+bazel run //scripts:license_texts_check -- $(pwd)/app/src/main/res/values/third_party_dependencies.xml || FAILURES=$((FAILURES+1))
 echo ""
 
 # TODO checks.
 echo "********************************"
 echo "Running TODO correctness checks"
 echo "********************************"
-bazel run //scripts:todo_open_check -- $(pwd) scripts/assets/todo_open_exemptions.pb
+bazel run //scripts:todo_open_check -- $(pwd) scripts/assets/todo_open_exemptions.pb || FAILURES=$((FAILURES+1))
 echo ""
+
+if [ "$FAILURES" -gt 0 ]; then
+    echo "$FAILURES check(s) failed. Please fix the above errors."
+    exit 1
+else
+    echo "All checks passed."
+    exit 0
+fi

From 177d48131c6739505004ca8e56854112ebbed2b9 Mon Sep 17 00:00:00 2001
From: Adan Aamir <adanaamir2005@gmail.com>
Date: Sun, 28 Jun 2026 00:33:30 +0500
Subject: [PATCH 2/2] Remove unintended merge changes

---
 scripts/static_checks.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/scripts/static_checks.sh b/scripts/static_checks.sh
index b0f82115999..871541ab095 100644
--- a/scripts/static_checks.sh
+++ b/scripts/static_checks.sh
@@ -107,14 +107,6 @@ echo "********************************"
 bazel run //scripts:maven_dependencies_list_check -- $(pwd) third_party/maven_install.json scripts/assets/maven_dependencies.pb || FAILURES=$((FAILURES+1))
 echo ""
 
-# License Texts Check
-echo "********************************"
-echo "Running license texts checks"
-echo "********************************"
-bazel run //scripts:license_texts_check -- $(pwd)/app/src/main/res/values/third_party_dependencies.xml || FAILURES=$((FAILURES+1))
-echo ""
-
-# TODO checks.
 # Open issue correctness checks.
 echo "********************************"
 echo "Running TODO correctness checks"