Fixes

Author: vaslabs

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

@@ -1,22 +1,16 @@
-inputs:
-  app-name:
-    description: 'The name of the Android app to test, e.g., JetNews or JetLagged'
-    required: true
-
 runs:
   using: "composite"
   steps:
-    - name: Run instrumentation tests
+    - name: Set Env variables
       run: |
-        ./mill show ${{ inputs.app-name }}.app.androidApk
-        ./mill show ${{ inputs.app-name }}.app.createAndroidVirtualDevice
-        ./mill --debug show ${{ inputs.app-name }}.app.startAndroidEmulator
-        ./mill show ${{ inputs.app-name }}.app.androidTest
-        ./mill show ${{ inputs.app-name }}.app.stopAndroidEmulator
+        echo "ANDROID_HOME=$HOME/.android/sdk" >> $GITHUB_ENV
+        echo "ANDROID_SDK_ROOT=$HOME/.android/sdk" >> $GITHUB_ENV
+        echo "ANDROID_USER_HOME=$HOME/.android/" >> $GITHUB_ENV
       shell: bash
 
-    - name: Upload test reports
-      uses: actions/upload-artifact@v4
-      with:
-        name: test-reports-jetnews
-        path: out/${{ inputs.app-name }}/app/androidTest/testForked.dest/test-report.xml
+    - name: Enable KVM group perms
+      run: |
+        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+        sudo udevadm control --reload-rules
+        sudo udevadm trigger --name-match=kvm
+      shell: bash

.github/actions/mill-android-test/action.yml

@@ -1,17 +1,22 @@
+inputs:
+  app-name:
+    description: 'The name of the Android app to test, e.g., JetNews or JetLagged'
+    required: true
+
 runs:
   using: "composite"
   steps:
-    - uses: coursier/cache-action@v6
-    - name: Set Env variables
+    - name: Run instrumentation tests
       run: |
-        echo "ANDROID_HOME=$HOME/.android/sdk" >> $GITHUB_ENV
-        echo "ANDROID_SDK_ROOT=$HOME/.android/sdk" >> $GITHUB_ENV
-        echo "ANDROID_USER_HOME=$HOME/.android/" >> $GITHUB_ENV
+        ./mill show ${{ inputs.app-name }}.app.androidApk
+        ./mill show ${{ inputs.app-name }}.app.createAndroidVirtualDevice
+        ./mill --debug show ${{ inputs.app-name }}.app.startAndroidEmulator
+        ./mill show ${{ inputs.app-name }}.app.androidTest
+        ./mill show ${{ inputs.app-name }}.app.stopAndroidEmulator
       shell: bash
 
-    - name: Enable KVM group perms
-      run: |
-        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-        sudo udevadm control --reload-rules
-        sudo udevadm trigger --name-match=kvm
-      shell: bash
+    - name: Upload test reports
+      uses: actions/upload-artifact@v4
+      with:
+        name: test-reports-jetnews
+        path: out/${{ inputs.app-name }}/app/androidTest/testForked.dest/test-report.xml

.github/workflows/Test.yaml

@@ -13,15 +13,14 @@ jobs:
     steps:
       - uses: coursier/cache-action@v6
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/android-setup
+      - uses: ./.github/actions/mill-android-test
         with:
           app-name: JetLagged
-      - uses: ./.github/actions/android-setup
+      - uses: ./.github/actions/mill-android-test
         with:
           app-name: JetNews
-      - uses: ./.github/actions/android-setup
+      - uses: ./.github/actions/mill-android-test
         with:
           app-name: Jetsnack
-      - uses: ./.github/actions/mill-android-test