From b58c0c24cc311225770618158a8f6ab16edd7b4d Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Fri, 1 Nov 2024 14:52:03 +0100
Subject: [PATCH] Apply fixes android-ci and android-device-test (#2985)

---
 .github/workflows/android-device-test.yml | 7 ++++---
 .github/workflows/android-release.yml     | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml
index 6172f3ffa1f..a7a22e9476a 100644
--- a/.github/workflows/android-device-test.yml
+++ b/.github/workflows/android-device-test.yml
@@ -113,7 +113,7 @@ jobs:
         with:
           token: ${{ steps.generate_token.outputs.token }}
           details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-          status: queued
+          status: in_progress
           name: ${{ matrix.test.name }}
           sha: ${{ github.event.workflow_run.head_sha }}
 
@@ -162,8 +162,9 @@ jobs:
         if: (matrix.test.name == 'Android Benchmark' || failure()) && env.run_device_test == 'true'
         run: |
           npm install
-          echo results_dir="$(mktemp -d)" >> "$GITHUB_ENV"
-          node scripts/aws-device-farm/store-test-artifacts.mjs --runArn ${{ steps.aws_device_farm_run.outputs.runArn }} --outputDir ${{ env.results_dir }}
+          results_dir="$(mktemp -d)"
+          echo results_dir="$results_dir" >> "$GITHUB_ENV"
+          node scripts/aws-device-farm/store-test-artifacts.mjs --runArn ${{ steps.aws_device_farm_run.outputs.runArn }} --outputDir "$results_dir"
           zip -r test_artifacts.zip ${{ env.results_dir }}
       
       - name: Store Benchmark Results
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index 307e495ec5c..dc78539fcb4 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -44,6 +44,12 @@ jobs:
           distribution: "temurin"
           java-version: "17"
 
+      - name: Get CMake and Ninja
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: 3.24.1
+          ninjaVersion: latest
+
       - name: Ensure source code revision
         run: scripts/ensure-code-revision.sh
         working-directory: platform/android