tidied up action inputs

Author: fbzli

.github/actions/android-app-setup/action.yml

@@ -1,26 +1,25 @@
 name: Setup Android App Build
-description: >
-  Extended setup for Android app build jobs (Alpaka, Play Store, code quality).
-  Calls android-base-setup and then computes build variables derived from the
-  flavor and app module inputs.
-  All inputs must be supplied by the caller — defaults live in the workflow files.
+description: Extended setup for Android app build jobs.
 
 inputs:
   checkout-token:
-    description: 'Token used for checkout. Falls back to the default GITHUB_TOKEN if not set.'
-    default: ${{ github.token }}
+    description: 'Token used for checkout.'
+    required: true
   use-git-lfs:
     description: 'Use git lfs during repository checkout.'
-  fetch-depth:
-    description: 'Number of commits to fetch during checkout.'
+    required: true
   jdk:
     description: 'The JDK version to use.'
+    required: true
   setup-rust:
     description: 'Whether to set up the Rust toolchain.'
+    required: true
   flavor:
     description: 'The build flavor. Used to compute flavor_capitalized.'
+    required: true
   app-module:
     description: 'The Gradle app module (e.g. "app" or "android:androidApp").'
+    required: true
 
 outputs:
   flavor_capitalized:
@@ -47,7 +46,6 @@ runs:
       with:
         checkout-token: ${{ inputs.checkout-token }}
         use-git-lfs: ${{ inputs.use-git-lfs }}
-        fetch-depth: ${{ inputs.fetch-depth }}
         jdk: ${{ inputs.jdk }}
         setup-rust: ${{ inputs.setup-rust }}
 

.github/actions/android-base-setup/action.yml

@@ -1,23 +1,21 @@
 name: Setup Android Environment
 description: >
   Base setup for Android CI jobs. Checks out the repository, installs zstd,
-  optionally sets up a JDK, and optionally sets up the Rust toolchain.
-  All inputs must be supplied by the caller — defaults live in the workflow files.
+  sets up a JDK, and optionally sets up the Rust toolchain.
 
 inputs:
   checkout-token:
-    description: 'Token used for checkout. Falls back to the default GITHUB_TOKEN if not set.'
-    default: ${{ github.token }}
+    description: 'Token used for checkout.'
+    required: true
   use-git-lfs:
     description: 'Use git lfs during repository checkout.'
-  fetch-depth:
-    description: 'Number of commits to fetch during checkout.'
-  setup-jdk:
-    description: 'Whether to set up a JDK.'
+    required: true
   jdk:
     description: 'The JDK version to use.'
+    required: true
   setup-rust:
     description: 'Whether to set up the Rust toolchain.'
+    required: true
 
 runs:
   using: composite
@@ -28,10 +26,9 @@ runs:
         token: ${{ inputs.checkout-token }}
         submodules: 'recursive'
         lfs: ${{ inputs.use-git-lfs }}
-        fetch-depth: ${{ inputs.fetch-depth }}
+        fetch-depth: 10
 
     - name: Set up JDK
-      if: ${{ inputs.setup-jdk != 'false' }}
       uses: actions/setup-java@v5.2.0
       with:
         distribution: 'zulu'

.github/actions/ssh-setup/action.yml

@@ -17,10 +17,9 @@ runs:
         if [ -e "$HOME/.ssh" ] && [ ! -d "$HOME/.ssh" ]; then
           echo "~/.ssh exists but is not a directory. Deleting it..."
           rm -f "$HOME/.ssh"
-          echo "Removed ~/.ssh."
-        else
-          echo "~/.ssh is either a directory or does not exist. No action needed."
         fi
+        mkdir -p "$HOME/.ssh"
+        chmod 700 "$HOME/.ssh"
 
     - name: Add SSH Key
       uses: webfactory/ssh-agent@dc588b651fe13675774614f8e6a936a468676387

.github/workflows/android_build_alpaka_upload.yml

@@ -25,7 +25,7 @@ on:
         default: ''
         required: false
         description: 'Suffix to the working directory of the script, only used for gradle build. Must end with a slash or be empty.'
-      setup-rust-tool-chain:
+      setup-rust:
         required: false
         default: false
         type: boolean
@@ -110,7 +110,7 @@ jobs:
           checkout-token: ${{ secrets.ANDROID_JENKINS_PAT }}
           use-git-lfs: ${{ inputs.use-git-lfs }}
           jdk: ${{ inputs.jdk }}
-          setup-rust: ${{ inputs.setup-rust-tool-chain }}
+          setup-rust: ${{ inputs.setup-rust }}
           flavor: ${{ inputs.flavor }}
           app-module: ${{ inputs.app-module }}
 

.github/workflows/android_build_store_upload.yml

@@ -11,7 +11,7 @@ on:
         required: false
         default: 'app'
         description: 'The gradle app module (e.g. custom "android:androidApp")'
-      setup-rust-tool-chain:
+      setup-rust:
         required: false
         default: false
         type: boolean
@@ -85,7 +85,7 @@ jobs:
           checkout-token: ${{ secrets.ANDROID_JENKINS_PAT }}
           use-git-lfs: ${{ inputs.use-git-lfs }}
           jdk: ${{ inputs.jdk }}
-          setup-rust: ${{ inputs.setup-rust-tool-chain }}
+          setup-rust: ${{ inputs.setup-rust }}
           flavor: ${{ inputs.flavor }}
           app-module: ${{ inputs.app-module }}
 
@@ -100,7 +100,7 @@ jobs:
             -PubiquePoEditorAPIKey=${{ secrets.UBIQUE_POEDITOR_API_KEY }} \
             -Pbuild_id=${{ steps.setup.outputs.build_id }} \
             -Pbuild_number=${{ steps.setup.outputs.build_number }} \
-            -Pbuild_batch=${{ steps.setup.outputs.build_batch }} \
+            -Pbuild_batch=release${{ steps.setup.outputs.build_batch }} \
             -Pbranch=${{ github.ref_name }} \
             -PcommitHash=${{ github.sha }} \
             ${{ secrets.ADDITIONAL_GRADLE_PROPS }}
@@ -138,7 +138,9 @@ jobs:
         uses: ./.github/actions/android-app-setup
         with:
           checkout-token: ${{ secrets.ANDROID_JENKINS_PAT }}
+          use-git-lfs: ${{ inputs.use-git-lfs }}
           jdk: ${{ inputs.jdk }}
+          setup-rust: false
           flavor: ${{ inputs.flavor }}
           app-module: ${{ inputs.app-module }}
 

.github/workflows/android_code_quality.yml

@@ -40,10 +40,15 @@ on:
         required: false
         default: '2026.03.1-ndk'
         description: The Android image version to use. Default is 2026.03.1-ndk.
-      setup-rust-tool-chain:
+      setup-rust:
         required: false
         default: false
         type: boolean
+      jdk:
+        type: string
+        required: false
+        default: '21'
+        description: 'The JDK version to use. Default is 21.'
       use-git-lfs:
         required: false
         default: false
@@ -95,7 +100,7 @@ jobs:
           checkout-token: ${{ secrets.ANDROID_JENKINS_PAT }}
           use-git-lfs: ${{ inputs.use-git-lfs }}
           jdk: ${{ inputs.jdk }}
-          setup-rust: ${{ inputs.setup-rust-tool-chain }}
+          setup-rust: ${{ inputs.setup-rust }}
           flavor: ${{ inputs.flavor }}
           app-module: ${{ inputs.app-module }}
 
@@ -156,7 +161,7 @@ jobs:
           checkout-token: ${{ secrets.ANDROID_JENKINS_PAT }}
           use-git-lfs: ${{ inputs.use-git-lfs }}
           jdk: ${{ inputs.jdk }}
-          setup-rust: ${{ inputs.setup-rust-tool-chain }}
+          setup-rust: ${{ inputs.setup-rust }}
           flavor: ${{ inputs.flavor }}
           app-module: ${{ inputs.app-module }}
 

.github/workflows/android_gradle_task.yml

@@ -32,6 +32,11 @@ on:
         default: false
         type: boolean
         description: 'Use git lfs during repository checkout'
+      jdk:
+        type: string
+        required: false
+        default: '21'
+        description: 'The JDK version to use. Default is 21.'
     secrets:
       ANDROID_JENKINS_PAT:
         required: false
@@ -64,7 +69,8 @@ jobs:
         with:
           checkout-token: ${{ secrets.ANDROID_JENKINS_PAT || github.token }}
           use-git-lfs: ${{ inputs.use-git-lfs }}
-          setup-jdk: 'false'
+          jdk: ${{ inputs.jdk }}
+          setup-rust: 'false'
 
       - name: Run Gradle task
         run: ./gradlew ${{ inputs.task }} ${{ inputs.gradle-args }} ${{ github.run_attempt > 1 && '--stacktrace --info' || '' }}

.github/workflows/android_library_artifactory.yml

@@ -28,7 +28,7 @@ on:
         required: false
         default: '21'
         description: The JDK version to use. Default is 21.
-      setup-rust-tool-chain:
+      setup-rust:
         required: false
         default: false
         type: boolean
@@ -66,7 +66,7 @@ jobs:
           checkout-token: ${{ secrets.ANDROID_JENKINS_PAT }}
           use-git-lfs: ${{ inputs.use-git-lfs }}
           jdk: ${{ inputs.jdk }}
-          setup-rust: ${{ inputs.setup-rust-tool-chain }}
+          setup-rust: ${{ inputs.setup-rust }}
 
       # Append version name suffix
       - name: Append version name suffix