fix: optimize adhoc artifact uploads and naming

Author: LukasMod

action.yml

@@ -290,16 +290,24 @@ runs:
       shell: bash
       working-directory: ${{ inputs.working-directory }}
 
-    - name: Update Artifact Name for re-signed builds
-      if: ${{ env.ARTIFACT_URL && inputs.re-sign == 'true' }}
+    - name: Set Identifier
+      if: ${{ inputs.re-sign == 'true' || inputs.ad-hoc == 'true' }}
       run: |
-        if [ "${{ github.event_name }}" = "pull_request" ]; then
-          IDENTIFIER="${{ github.event.pull_request.number }}"
-        elif [ -n "${{ inputs.custom-ref }}" ]; then
+        if [ -n "${{ inputs.custom-ref }}" ]; then
           IDENTIFIER="${{ inputs.custom-ref }}"
+        elif [ "${{ github.event_name }}" = "pull_request" ]; then
+          IDENTIFIER="${{ github.event.pull_request.number }}"
         else
           IDENTIFIER=$(echo "$GITHUB_SHA" | cut -c1-7)
         fi
+        echo "IDENTIFIER=$IDENTIFIER" >> $GITHUB_ENV
+      shell: bash
+
+    # Non-ad-hoc re-sign flow: add identifier to ARTIFACT_NAME so the re-signed ZIP Artifact doesn't overwrite the base ZIP.
+    # Skipped for ad-hoc — ARTIFACT_NAME stays fingerprint-only (one ZIP Artifact per fingerprint).
+    - name: Update Artifact Name for re-signed builds
+      if: ${{ env.ARTIFACT_URL && inputs.re-sign == 'true' && inputs.ad-hoc != 'true' }}
+      run: |
         ARTIFACT_TRAITS="${{ inputs.variant }},${IDENTIFIER}"
         ARTIFACT_TRAITS_HYPHENATED=$(echo "$ARTIFACT_TRAITS" | tr ',' '-')
         ARTIFACT_TRAITS_HYPHENATED_FINGERPRINT="${ARTIFACT_TRAITS_HYPHENATED}-${FINGERPRINT}"
@@ -328,28 +336,45 @@ runs:
         path: ${{ env.ARTIFACT_PATH }}
         if-no-files-found: error
 
+    # Non-ad-hoc re-sign flow: upload ZIP Artifact with {identifier}-{fingerprint} name
     # For re-signed builds, the ARTIFACT_NAME may contain PR-number, while Rock will save the artifact without PR trait in its cache.
     # We need to upload the artifact with the PR-number in the name, that's why we use --binary-path with appropriate ARTIFACT_PATH that accounts for it.
-    - name: Upload Artifact to Remote Cache for re-signed builds
-      if: ${{ env.PROVIDER_NAME != 'GitHub' && inputs.re-sign == 'true' }}
+    - name: Upload re-signed ZIP Artifact for non-ad-hoc flow
+      if: ${{ env.PROVIDER_NAME != 'GitHub' && inputs.re-sign == 'true' && inputs.ad-hoc != 'true' }}
       run: |
         OUTPUT=$(npx rock remote-cache upload --name ${{ env.ARTIFACT_NAME }} --binary-path "${{ env.ARTIFACT_PATH }}" --json --verbose) || (echo "$OUTPUT" && exit 1)
         echo "ARTIFACT_URL=$(echo "$OUTPUT" | jq -r '.url')" >> $GITHUB_ENV
       shell: bash
 
-    - name: Upload Artifact to Remote Cache for regular builds
-      if: ${{ env.PROVIDER_NAME != 'GitHub' && inputs.re-sign != 'true' && !env.ARTIFACT_URL }}
+    # Upload ZIP Artifact with {fingerprint}-only name as base ZIP Artifact for caching only (first build only).
+    # Runs only when no cached artifact exists (!ARTIFACT_URL), meaning native build was done from scratch.
+    # Excludes non-ad-hoc re-sign, which uploads with identifier in the name.
+    # Applies to:
+    # - regular builds (no ad-hoc, no re-sign)
+    # - re-sign with ad-hoc
+    - name: Upload ZIP Artifact for caching
+      if: ${{ env.PROVIDER_NAME != 'GitHub' && !env.ARTIFACT_URL && (inputs.re-sign != 'true' || inputs.ad-hoc == 'true') }}
       run: |
         OUTPUT=$(npx rock remote-cache upload --name ${{ env.ARTIFACT_NAME }} --json --verbose) || (echo "$OUTPUT" && exit 1)
         echo "ARTIFACT_URL=$(echo "$OUTPUT" | jq -r '.url')" >> $GITHUB_ENV
       shell: bash
 
-    # For ad-hoc builds, the ARTIFACT_NAME may contain PR-number, while Rock will save the artifact without PR trait in its cache.
-    # We need to upload the artifact with the PR-number in the name, that's why we use --binary-path with appropriate ARTIFACT_PATH that accounts for it.
+
+    # Ad-hoc uploads always include an identifier in the name {identifier}-{fingerprint}
+    - name: Set Ad-Hoc Artifact Name
+      if: ${{ inputs.ad-hoc == 'true' }}
+      run: |
+        ADHOC_TRAITS="${{ inputs.variant }},${IDENTIFIER}"
+        ADHOC_TRAITS_HYPHENATED=$(echo "$ADHOC_TRAITS" | tr ',' '-')
+        echo "ADHOC_ARTIFACT_NAME=rock-android-${ADHOC_TRAITS_HYPHENATED}-${FINGERPRINT}" >> $GITHUB_ENV
+      shell: bash
+
+    # Uploads APK/AAB + index.html under ad-hoc/{ADHOC_ARTIFACT_NAME}/.
+    # The ARTIFACT_URL output points to index.html
     - name: Upload for Ad-hoc distribution
       if: ${{ env.PROVIDER_NAME != 'GitHub' && inputs.ad-hoc == 'true' }}
       run: |
-        OUTPUT=$(npx rock remote-cache upload --name ${{ env.ARTIFACT_NAME }} --binary-path "${{ env.ARTIFACT_PATH }}" --json --ad-hoc) || (echo "$OUTPUT" && exit 1)
+        OUTPUT=$(npx rock remote-cache upload --name ${{ env.ADHOC_ARTIFACT_NAME }} --binary-path "${{ env.ARTIFACT_PATH }}" --json --ad-hoc) || (echo "$OUTPUT" && exit 1)
         echo "ARTIFACT_URL=$(echo "$OUTPUT" | jq -r '.url')" >> $GITHUB_ENV
       shell: bash