From 948e29a6ec5ded191557ebf9406f5370e9d39414 Mon Sep 17 00:00:00 2001
From: Shankhanil Saha <shankhanilsaha@gmail.com>
Date: Sat, 18 Jul 2026 15:49:25 +0530
Subject: [PATCH 1/2] refactor: Change the intermediate build target to
 oppia_flavor_binary_deploy.jar in build_test.yml

---
 .github/workflows/build_tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml
index 36351b51c4f..5acbfd0d9fc 100644
--- a/.github/workflows/build_tests.yml
+++ b/.github/workflows/build_tests.yml
@@ -95,10 +95,10 @@ jobs:
           if [[ "${{ matrix.flavor }}" == "dev" ]]; then
             bazel build -- //:oppia_${{ matrix.flavor }}
           else
-            # Build the deployable (pre-Proguard-map) AAB first, then shutdown Bazel to release
+            # Build the oppia_flavor_binary_deploy.jar first (pre-Proguard-map), then shutdown Bazel to release
             # JVM memory accumulated during the heavy Proguard step. This avoids OOM crashes
-            # error code 14 when building the final AAB that packages the Proguard map.
-            bazel build --compilation_mode=opt -- //:oppia_${{ matrix.flavor }}_deployable
+            # when building the final AAB that packages the Proguard map.
+            bazel build --compilation_mode=opt -- //:oppia_${{ matrix.flavor }}_binary_deploy.jar
             bazel shutdown
             bazel build --compilation_mode=opt -- //:oppia_${{ matrix.flavor }}
           fi

From 3b462ad8afb3ce0dcfe6b8fba9e984de1d45cf43 Mon Sep 17 00:00:00 2001
From: Shankhanil Saha <shankhanilsaha@gmail.com>
Date: Sat, 18 Jul 2026 16:08:58 +0530
Subject: [PATCH 2/2] refactor: Change the intermediate build target to
 oppia_flavor_binary_deploy.jar in stats.yml

---
 .github/workflows/stats.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/stats.yml b/.github/workflows/stats.yml
index acdf8f3cccf..1a2c7baf7ab 100644
--- a/.github/workflows/stats.yml
+++ b/.github/workflows/stats.yml
@@ -212,14 +212,14 @@ jobs:
         run: |
           cd head
           git log -n 1
-          # Build dev (no Proguard) and Proguard-enabled deployable targets first.
-          bazel build -- //:oppia_dev //:oppia_alpha_deployable //:oppia_beta_deployable //:oppia_ga_deployable
-          cp bazel-bin/oppia_dev.aab ../develop/oppia_dev_with_changes.aab
-          # Shutdown Bazel to release JVM memory accumulated during Proguard, then build the
-          # lightweight final AABs that package the Proguard map. This avoids OOM crashes
-          # (error code 14).
+          bazel build -- //:oppia_dev
+          # Build the oppia_flavor_binary_deploy.jar first (pre-Proguard-map), then shutdown Bazel to release
+          # JVM memory accumulated during the heavy Proguard step. This avoids OOM crashes
+          # when building the final AAB that packages the Proguard map.
+          bazel build -- //:oppia_alpha_binary_deploy.jar //:oppia_beta_binary_deploy.jar //:oppia_ga_binary_deploy.jar
           bazel shutdown
           bazel build -- //:oppia_alpha //:oppia_beta //:oppia_ga
+          cp bazel-bin/oppia_dev.aab ../develop/oppia_dev_with_changes.aab
           cp bazel-bin/oppia_alpha.aab ../develop/oppia_alpha_with_changes.aab
           cp bazel-bin/oppia_beta.aab ../develop/oppia_beta_with_changes.aab
           cp bazel-bin/oppia_ga.aab ../develop/oppia_ga_with_changes.aab
@@ -230,14 +230,14 @@ jobs:
         run: |
           cd base
           git log -n 1
-          # Build dev (no Proguard) and Proguard-enabled deployable targets first.
-          bazel build -- //:oppia_dev //:oppia_alpha_deployable //:oppia_beta_deployable //:oppia_ga_deployable
-          cp bazel-bin/oppia_dev.aab ../develop/oppia_dev_without_changes.aab
-          # Shutdown Bazel to release JVM memory accumulated during Proguard, then build the
-          # lightweight final AABs that package the Proguard map. This avoids OOM crashes
-          # (error code 14).
+          bazel build -- //:oppia_dev
+          # Build the oppia_flavor_binary_deploy.jar first (pre-Proguard-map), then shutdown Bazel to release
+          # JVM memory accumulated during the heavy Proguard step. This avoids OOM crashes
+          # when building the final AAB that packages the Proguard map.
+          bazel build -- //:oppia_alpha_binary_deploy.jar //:oppia_beta_binary_deploy.jar //:oppia_ga_binary_deploy.jar
           bazel shutdown
           bazel build -- //:oppia_alpha //:oppia_beta //:oppia_ga
+          cp bazel-bin/oppia_dev.aab ../develop/oppia_dev_without_changes.aab
           cp bazel-bin/oppia_alpha.aab ../develop/oppia_alpha_without_changes.aab
           cp bazel-bin/oppia_beta.aab ../develop/oppia_beta_without_changes.aab
           cp bazel-bin/oppia_ga.aab ../develop/oppia_ga_without_changes.aab