From 52e675d0741210c529ed3c3f42aa3bc60d1da0f6 Mon Sep 17 00:00:00 2001
From: Oleh Kuznetsov <okuznetsov@google.com>
Date: Wed, 5 Aug 2026 13:21:36 +0100
Subject: [PATCH 1/2] ci: remove arm64-v8a filter from android debug builds

---
 .github/workflows/release_build.yml     | 4 ++--
 .github/workflows/sdk_android_build.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
index dc6fbfd9c7..9ccf316097 100644
--- a/.github/workflows/release_build.yml
+++ b/.github/workflows/release_build.yml
@@ -198,7 +198,7 @@ jobs:
         then
           sh gradlew assembleRelease -Parm64-v8a
         else
-          sh gradlew assembleDebug -Parm64-v8a
+          sh gradlew assembleDebug
         fi
     - name: Prepare artifacts
       run: |
@@ -354,4 +354,4 @@ jobs:
         TAG_NAME: ${{ steps.get_tag_name.outputs.tag_name }}
         SUFFIX: ${{ matrix.config.suffix }}
       run: |
-        gh release upload "${TAG_NAME}" "./gfxreconstruct-${TAG_NAME}-${SUFFIX}" --clobber
+        gh release upload "${TAG_NAME}" "./gfxreconstruct-${TAG_NAME}-${SUFFIX}" --repo "${GITHUB_REPOSITORY}" --clobber
diff --git a/.github/workflows/sdk_android_build.yml b/.github/workflows/sdk_android_build.yml
index e7b728d8d1..fe2f9626c4 100644
--- a/.github/workflows/sdk_android_build.yml
+++ b/.github/workflows/sdk_android_build.yml
@@ -174,4 +174,4 @@ MESSAGE
         TAG_NAME: ${{ steps.get_tag_name.outputs.tag_name }}
         SUFFIX: ${{ matrix.config.suffix }}
       run: |
-        gh release upload "${TAG_NAME}" "./gfxreconstruct-${TAG_NAME}-${SUFFIX}" --clobber
+        gh release upload "${TAG_NAME}" "./gfxreconstruct-${TAG_NAME}-${SUFFIX}" --repo "${GITHUB_REPOSITORY}" --clobber

From f4150f3e6f14061bb2c8bfc380337e029b3ebf77 Mon Sep 17 00:00:00 2001
From: Oleh Kuznetsov <okuznetsov@google.com>
Date: Wed, 5 Aug 2026 15:11:52 +0100
Subject: [PATCH 2/2] ci: add write permissions to publish artifact jobs

---
 .github/workflows/release_build.yml     | 2 ++
 .github/workflows/sdk_android_build.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
index 9ccf316097..c23e68f382 100644
--- a/.github/workflows/release_build.yml
+++ b/.github/workflows/release_build.yml
@@ -270,6 +270,8 @@ jobs:
         path: ./release_url
 
   publish:
+    permissions:
+      contents: write
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
     needs: release
diff --git a/.github/workflows/sdk_android_build.yml b/.github/workflows/sdk_android_build.yml
index fe2f9626c4..aa513e3d9a 100644
--- a/.github/workflows/sdk_android_build.yml
+++ b/.github/workflows/sdk_android_build.yml
@@ -115,6 +115,8 @@ MESSAGE
         path: ./release_url
 
   publish:
+    permissions:
+      contents: write
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
     needs: release