From 3ef776a1b39860ec6ddfd36ace429f212995f333 Mon Sep 17 00:00:00 2001
From: Sam Hirst <sam.hirst@arm.com>
Date: Wed, 26 Aug 2026 12:14:53 +0100
Subject: [PATCH 1/2] fix: add setup information for Windows runners

Report the operating system name, version, and architecture in the job
setup output. Include the EC2 instance type and availability zone so
Windows diagnostics match the information shown for Linux runners.
---
 modules/runners/templates/start-runner.ps1 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/runners/templates/start-runner.ps1 b/modules/runners/templates/start-runner.ps1
index ae2eeff3c9..7cc4c394be 100644
--- a/modules/runners/templates/start-runner.ps1
+++ b/modules/runners/templates/start-runner.ps1
@@ -165,10 +165,20 @@ if ($enable_jit_config -eq "false" -or $agent_mode -ne "ephemeral") {
   Tag-InstanceWithRunnerId
 }
 
+$operatingSystem = Get-CimInstance -ClassName Win32_OperatingSystem
+
 $jsonBody = @(
+    @{
+        group='Operating System'
+        detail="Distribution: $($operatingSystem.Caption)`nVersion: $($operatingSystem.Version)`nArchitecture: $($operatingSystem.OSArchitecture)"
+    },
     @{
         group='Runner Image'
         detail="AMI id: $ami_id"
+    },
+    @{
+        group='EC2'
+        detail="Instance type: $($metadata.instanceType)`nAvailability zone: $($metadata.availabilityZone)"
     }
 )
 ConvertTo-Json -InputObject $jsonBody | Set-Content -Path "$pwd\.setup_info"

From 0dd9fa98fe2b2cc33489987a78d8ce312e09ad42 Mon Sep 17 00:00:00 2001
From: Sam Hirst <sam.hirst@arm.com>
Date: Wed, 26 Aug 2026 12:15:12 +0100
Subject: [PATCH 2/2] fix: add AMI information for macOS runners

Retrieve the AMI ID from EC2 instance metadata and include it in the
job setup output. This brings macOS runner image details in line with
the other supported platforms.
---
 modules/runners/templates/start-runner-osx.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/runners/templates/start-runner-osx.sh b/modules/runners/templates/start-runner-osx.sh
index a6da66116d..0607873309 100644
--- a/modules/runners/templates/start-runner-osx.sh
+++ b/modules/runners/templates/start-runner-osx.sh
@@ -66,6 +66,9 @@ if [ -z "$token" ]; then
   done
 fi
 
+ami_id=$(curl -f -H "X-aws-ec2-metadata-token: $token" \
+  http://169.254.169.254/latest/meta-data/ami-id)
+
 region=$(curl -f -H "X-aws-ec2-metadata-token: $token" \
   http://169.254.169.254/latest/dynamic/instance-identity/document | jq -r .region)
 echo "Retrieved REGION from AWS API ($region)"
@@ -142,6 +145,10 @@ tee /opt/actions-runner/.setup_info <<EOL
     "group": "Operating System",
     "detail": "Distribution: $info_os $info_ver\nArchitecture: $info_arch"
   },
+  {
+    "group": "Runner Image",
+    "detail": "AMI id: $ami_id"
+  },
   {
     "group": "EC2",
     "detail": "Instance id: $instance_id\nAvailability zone: $availability_zone"