tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Pixel 4a to Android render test run (#3455)

Browse Source
This commit is contained in:
Bart Louwers
2025-05-09 15:33:46 +02:00
committed by GitHub
parent 92cf551ec1
commit c4908e4df2
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/android-device-test.yml vendored
View File

@@ -20,16 +20,17 @@ jobs:
testFile: RenderTests-opengl.apk, testFile: RenderTests-opengl.apk,
appFile: RenderTestsApp-opengl.apk, appFile: RenderTestsApp-opengl.apk,
name: "Android Render Tests (OpenGL)", name: "Android Render Tests (OpenGL)",
# Google Pixel 7 Pro # Pixel 4a Android 12, Pixel 7 Pro Android 13
devicePool: "arn:aws:devicefarm:us-west-2:373521797162:devicepool:20687d72-0e46-403e-8f03-0941850665bc/9692fe7f-86a9-4ecc-908f-175600968564" devicePool: "arn:aws:devicefarm:us-west-2:373521797162:devicepool:20687d72-0e46-403e-8f03-0941850665bc/55db2b56-930a-4485-bdc0-03409a5a6060",
testSpecArn: "arn:aws:devicefarm:us-west-2:373521797162:upload:20687d72-0e46-403e-8f03-0941850665bc/c1fc7d3e-dfe3-4a31-9ee0-7b0f71b08872"
}, },
{ {
artifactName: android-render-tests-vulkan, artifactName: android-render-tests-vulkan,
testFile: RenderTests-vulkan.apk, testFile: RenderTests-vulkan.apk,
appFile: RenderTestsApp-vulkan.apk, appFile: RenderTestsApp-vulkan.apk,
name: "Android Render Tests (Vulkan)", name: "Android Render Tests (Vulkan)",
# Google Pixel 7 Pro # Pixel 4a Android 12, Pixel 7 Pro Android 13
devicePool: "arn:aws:devicefarm:us-west-2:373521797162:devicepool:20687d72-0e46-403e-8f03-0941850665bc/9692fe7f-86a9-4ecc-908f-175600968564", devicePool: "arn:aws:devicefarm:us-west-2:373521797162:devicepool:20687d72-0e46-403e-8f03-0941850665bc/55db2b56-930a-4485-bdc0-03409a5a6060",
# android-render-test.yml # android-render-test.yml
# see https://github.com/maplibre/ci-runners/tree/main/aws-device-farm/custom-test-envs # see https://github.com/maplibre/ci-runners/tree/main/aws-device-farm/custom-test-envs
testSpecArn: "arn:aws:devicefarm:us-west-2:373521797162:upload:20687d72-0e46-403e-8f03-0941850665bc/c1fc7d3e-dfe3-4a31-9ee0-7b0f71b08872" testSpecArn: "arn:aws:devicefarm:us-west-2:373521797162:upload:20687d72-0e46-403e-8f03-0941850665bc/c1fc7d3e-dfe3-4a31-9ee0-7b0f71b08872"
@@ -169,6 +170,8 @@ jobs:
results_dir="$(mktemp -d)" results_dir="$(mktemp -d)"
echo results_dir="$results_dir" >> "$GITHUB_ENV" echo results_dir="$results_dir" >> "$GITHUB_ENV"
node scripts/aws-device-farm/store-test-artifacts.mjs --runArn ${{ env.run_arn }} --outputDir "$results_dir" node scripts/aws-device-farm/store-test-artifacts.mjs --runArn ${{ env.run_arn }} --outputDir "$results_dir"
# unzip and delete .zip files so we don't have nested .zip
find "$results_dir" -type f -name '*.zip' -exec sh -c 'unzip -o -d "$(dirname "$1")" "$1" && rm "$1"' _ {} \;
zip -r test_artifacts.zip "$results_dir" zip -r test_artifacts.zip "$results_dir"
- name: Store Benchmark Results - name: Store Benchmark Results

4
scripts/aws-device-farm/store-test-artifacts.mjs
View File

@@ -2,7 +2,6 @@ import * as fs from "node:fs";
import { Readable } from "node:stream"; import { Readable } from "node:stream";
import { finished } from "node:stream/promises"; import { finished } from "node:stream/promises";
import * as path from "node:path"; import * as path from "node:path";
import * as crypto from "node:crypto";
import { parseArgs } from "node:util"; import { parseArgs } from "node:util";
import { ArtifactType, ListArtifactsCommand, ListJobsCommand, ListSuitesCommand } from "@aws-sdk/client-device-farm"; import { ArtifactType, ListArtifactsCommand, ListJobsCommand, ListSuitesCommand } from "@aws-sdk/client-device-farm";
@@ -104,7 +103,8 @@ async function storeRunArtifacts(arnArr, outputDir) {
if (!artifact.name || !artifact.url || !artifact.type) return; if (!artifact.name || !artifact.url || !artifact.type) return;
if (artifactsToDownload.includes(artifact.type)) { if (artifactsToDownload.includes(artifact.type)) {
if (!artifact.arn) return; if (!artifact.arn) return;
const destination = path.join(outputDir, `${Buffer.from(artifact.arn).toString('base64')}.${artifact.extension}`); const destination = path.join(outputDir, ...[job.device?.name || ""].filter(x => x), `${Buffer.from(artifact.arn).toString('base64')}.${artifact.extension}`);
await fs.promises.mkdir(path.dirname(destination), { recursive: true });
try { try {
await fs.promises.access(destination); await fs.promises.access(destination);
return; // already exists return; // already exists