ci: stabilize branch cache workflow

Author: Apricityx

.github/workflows/build-android-arm64.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - codex/fix-android-arm64-build
 
 jobs:
   build:
@@ -36,39 +37,32 @@ jobs:
             "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
             "ndk;${ANDROID_NDK_VERSION}"
 
-      - name: Set Up Java 11
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: "11"
-
-      - name: Restore Bazel caches
+      - name: Restore Bazel Repository Cache
         uses: actions/cache@v4
         with:
-          path: |
-            ${{ github.workspace }}/.bazel-cache/repository
-            ${{ github.workspace }}/.bazel-cache/disk
+          path: ${{ github.workspace }}/.bazel-cache/repository
           key: ${{ runner.os }}-bazel-${{ env.ANDROID_PLATFORM }}-${{ env.TFJAVA_COMMIT }}-${{ hashFiles('scripts/patch_tfjava.py', '.github/workflows/build-android-arm64.yml') }}
           restore-keys: |
             ${{ runner.os }}-bazel-${{ env.ANDROID_PLATFORM }}-${{ env.TFJAVA_COMMIT }}-
             ${{ runner.os }}-bazel-${{ env.ANDROID_PLATFORM }}-
 
-      - name: Restore Maven repository cache
-        uses: actions/cache@v4
-        with:
-          path: /home/runner/.m2/repository
-          key: ${{ runner.os }}-m2-${{ env.TFJAVA_COMMIT }}-${{ hashFiles('scripts/patch_tfjava.py', '.github/workflows/build-android-arm64.yml') }}
-          restore-keys: |
-            ${{ runner.os }}-m2-${{ env.TFJAVA_COMMIT }}-
-            ${{ runner.os }}-m2-
-
       - name: Clone TensorFlow Java
         shell: bash
         run: |
           git clone https://github.com/tensorflow/java.git tfjava
           cd tfjava
           git checkout "${TFJAVA_COMMIT}"
 
+      - name: Set Up Java 11
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: "11"
+          cache: maven
+          cache-dependency-path: |
+            tfjava/pom.xml
+            tfjava/**/pom.xml
+
       - name: Patch TensorFlow Java For Android ARM64
         shell: bash
         run: |
@@ -123,8 +117,7 @@ jobs:
           export LC_ALL="C.UTF-8"
           export PATH="${JAVA_HOME}/bin:${PATH}"
           export BAZEL_REPOSITORY_CACHE="${GITHUB_WORKSPACE}/.bazel-cache/repository"
-          export BAZEL_DISK_CACHE="${GITHUB_WORKSPACE}/.bazel-cache/disk"
-          mkdir -p "${BAZEL_REPOSITORY_CACHE}" "${BAZEL_DISK_CACHE}"
+          mkdir -p "${BAZEL_REPOSITORY_CACHE}"
           mkdir -p "${GITHUB_WORKSPACE}/artifacts"
           cd tfjava
           mvn -B -e \
@@ -152,12 +145,15 @@ jobs:
               raise SystemExit(0)
 
           lines = log_path.read_text(encoding="utf-8", errors="ignore").splitlines()
-          patterns = [
-              re.compile(r"^(.+?:\d+(?::\d+)?: (?:fatal )?error: .+)$"),
-              re.compile(r"^(.+?UnsatisfiedLinkError.+)$"),
-              re.compile(r"^(.+?NoSuch.+)$"),
-              re.compile(r"^(ERROR: .+)$"),
-              re.compile(r"^(FAILED: .+)$"),
+          primary_patterns = [
+              re.compile(r"^\s*.+?:\d+(?::\d+)?: (?:fatal )?error: .+$"),
+              re.compile(r"^\s*.+?: error: .+$"),
+              re.compile(r"^\s*(?:ld(?:\.lld)?|clang(?:\+\+)?): error: .+$"),
+              re.compile(r"^\s*undefined reference to .+$"),
+              re.compile(r"^\s*cannot find -l.+$"),
+              re.compile(r"^\s*collect2: error: .+$"),
+              re.compile(r"^\s*.+?UnsatisfiedLinkError.+$"),
+              re.compile(r"^\s*.+?NoSuch.+$"),
           ]
 
           skip = (
@@ -167,16 +163,38 @@ jobs:
               "BUILD FAILURE",
               "compilation of rule",
               "Linking of rule",
+              "Failed to restore: Cache service responded with 400",
           )
 
+          def is_skippable(line: str) -> bool:
+              return any(token in line for token in skip)
+
           hit = None
           for i, line in enumerate(lines):
-              if any(token in line for token in skip):
+              if is_skippable(line):
                   continue
-              if any(p.search(line) for p in patterns):
+              if any(p.search(line) for p in primary_patterns):
                   hit = i
                   break
 
+          if hit is None:
+              for i in range(len(lines) - 1, -1, -1):
+                  line = lines[i]
+                  normalized = line.strip()
+                  if not normalized or is_skippable(line):
+                      continue
+                  if "error:" in normalized or "undefined reference" in normalized:
+                      hit = i
+                      break
+
+          if hit is None:
+              for i, line in enumerate(lines):
+                  if is_skippable(line):
+                      continue
+                  if line.startswith("ERROR: ") or line.startswith("FAILED: "):
+                      hit = i
+                      break
+
           if hit is None:
               hit = max(0, len(lines) - 80)