From 383902e9e2e2dff5b7c0b5c411f2f349b8660ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= <thymikee@gmail.com>
Date: Thu, 30 Jul 2026 17:54:25 +0200
Subject: [PATCH] feat: use remote cache status

---
 README.md  |  2 +-
 action.yml | 38 ++++++++++++--------------------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 11a0c03..510fff3 100644
--- a/README.md
+++ b/README.md
@@ -175,7 +175,7 @@ Internally this uses `npx rock validate-elf-alignment`, which requires `objdump`
 ## Prerequisites
 
 - Ubuntu runner
-- Rock CLI installed in your project
+- Rock CLI 0.15.1 or newer installed in your project
 - For release builds:
   - Valid Android keystore file
   - Proper code signing setup
diff --git a/action.yml b/action.yml
index b3c7cd6..7b35d6d 100644
--- a/action.yml
+++ b/action.yml
@@ -123,14 +123,6 @@ runs:
         fi
       shell: bash
 
-    - name: Native Fingerprint
-      id: fingerprint
-      run: |
-        FINGERPRINT_OUTPUT=$(npx rock fingerprint -p android --raw) || (echo "$FINGERPRINT_OUTPUT" && exit 1)
-        echo "FINGERPRINT=$FINGERPRINT_OUTPUT" >> $GITHUB_ENV
-      shell: bash
-      working-directory: ${{ inputs.working-directory }}
-
     - name: Set Binary Ext
       run: |
         echo "BINARY_EXT=${{ inputs.aab == 'true' && 'aab' || 'apk' }}" >> $GITHUB_ENV
@@ -157,11 +149,12 @@ runs:
         ARTIFACT_TRAITS="${{ inputs.variant }},${{ github.event.pull_request.number}}"
         echo "ARTIFACT_TRAITS=$ARTIFACT_TRAITS" >> $GITHUB_ENV
 
-        OUTPUT=$(npx rock remote-cache list -p android --traits "${ARTIFACT_TRAITS}" --json) || (echo "$OUTPUT" && exit 1)
-        if [ "$OUTPUT" ]; then
-          echo "ARTIFACT_URL=$(echo "$OUTPUT" | jq -r '.url')" >> $GITHUB_ENV
-          echo "ARTIFACT_ID=$(echo "$OUTPUT" | jq -r '.id')" >> $GITHUB_ENV
-          echo "ARTIFACT_NAME=$(echo "$OUTPUT" | jq -r '.name')" >> $GITHUB_ENV
+        STATUS_OUTPUT=$(npx rock remote-cache status -p android --traits "$ARTIFACT_TRAITS" --json) || (echo "$STATUS_OUTPUT" && exit 1)
+        echo "FINGERPRINT=$(echo "$STATUS_OUTPUT" | jq -er '.fingerprint')" >> $GITHUB_ENV
+        if [ "$(echo "$STATUS_OUTPUT" | jq -r '.hit')" = "true" ]; then
+          echo "ARTIFACT_URL=$(echo "$STATUS_OUTPUT" | jq -r '.artifact.url')" >> $GITHUB_ENV
+          echo "ARTIFACT_ID=$(echo "$STATUS_OUTPUT" | jq -r '.artifact.id // empty')" >> $GITHUB_ENV
+          echo "ARTIFACT_NAME=$(echo "$STATUS_OUTPUT" | jq -r '.artifactName')" >> $GITHUB_ENV
         fi
       shell: bash
       working-directory: ${{ inputs.working-directory }}
@@ -172,22 +165,15 @@ runs:
         ARTIFACT_TRAITS="${{ inputs.variant }}"
         echo "ARTIFACT_TRAITS=$ARTIFACT_TRAITS" >> $GITHUB_ENV
 
-        OUTPUT=$(npx rock remote-cache list -p android --traits "${ARTIFACT_TRAITS}" --json) || (echo "$OUTPUT" && exit 1)
-        if [ "$OUTPUT" ]; then
-          echo "ARTIFACT_URL=$(echo "$OUTPUT" | jq -r '.url')" >> $GITHUB_ENV
-          echo "ARTIFACT_ID=$(echo "$OUTPUT" | jq -r '.id')" >> $GITHUB_ENV
-          echo "ARTIFACT_NAME=$(echo "$OUTPUT" | jq -r '.name')" >> $GITHUB_ENV
+        STATUS_OUTPUT=$(npx rock remote-cache status -p android --traits "$ARTIFACT_TRAITS" --json) || (echo "$STATUS_OUTPUT" && exit 1)
+        echo "FINGERPRINT=$(echo "$STATUS_OUTPUT" | jq -er '.fingerprint')" >> $GITHUB_ENV
+        echo "ARTIFACT_NAME=$(echo "$STATUS_OUTPUT" | jq -er '.artifactName')" >> $GITHUB_ENV
+        if [ "$(echo "$STATUS_OUTPUT" | jq -r '.hit')" = "true" ]; then
+          echo "ARTIFACT_URL=$(echo "$STATUS_OUTPUT" | jq -r '.artifact.url')" >> $GITHUB_ENV
+          echo "ARTIFACT_ID=$(echo "$STATUS_OUTPUT" | jq -r '.artifact.id // empty')" >> $GITHUB_ENV
         fi
       shell: bash
       working-directory: ${{ inputs.working-directory }}
-    - name: Set Artifact Name (if not set)
-      if: ${{ !env.ARTIFACT_NAME }}
-      run: |
-        # Transform commas to hyphens
-        ARTIFACT_TRAITS_HYPHENATED=$(echo "$ARTIFACT_TRAITS" | tr ',' '-')
-        ARTIFACT_TRAITS_HYPHENATED_FINGERPRINT="${ARTIFACT_TRAITS_HYPHENATED}-${FINGERPRINT}"
-        echo "ARTIFACT_NAME=rock-android-${ARTIFACT_TRAITS_HYPHENATED_FINGERPRINT}" >> $GITHUB_ENV
-      shell: bash
 
     - name: Install Java
       if: ${{ inputs.setup-java == 'true' && !env.ARTIFACT_URL }}