Make ARM/ICU patch conditional in user_data.sh.

Author: bdruth

main.tf

@@ -4,6 +4,7 @@ locals {
   })
 
   s3_action_runner_url = "s3://${module.runner_binaries.bucket.id}/${module.runner_binaries.runner_distribution_object_key}"
+  runner_architecture = substr(var.instance_type, 0, 2) == "a1" || substr(var.instance_type, 1, 2) == "6g" ? "arm64" : "x64"
 }
 
 resource "random_string" "random" {
@@ -62,7 +63,8 @@ module "runners" {
 
   instance_type = var.instance_type
 
-  ami_filter = substr(var.instance_type, 0, 2) == "a1" || substr(var.instance_type, 1, 2) == "6g" ? { name = ["amzn2-ami-hvm-2*-arm64-gp2"] } : { name = ["amzn2-ami-hvm-2.*-x86_64-ebs"] }
+  runner_architecture = local.runner_architecture
+  ami_filter = local.runner_architecture == "arm64" ? { name = ["amzn2-ami-hvm-2*-arm64-gp2"] } : { name = ["amzn2-ami-hvm-2.*-x86_64-ebs"] }
 
   sqs_build_queue                 = aws_sqs_queue.queued_builds
   github_app                      = var.github_app

modules/runners/main.tf

@@ -79,6 +79,7 @@ resource "aws_launch_template" "runner" {
     post_install                    = var.userdata_post_install
     s3_location_runner_distribution = var.s3_location_runner_binaries
     service_user                    = var.runner_as_root ? "root" : "ec2-user"
+    runner_architecture             = var.runner_architecture
   }))
 
   tags = local.tags

modules/runners/templates/user-data.sh

@@ -20,6 +20,7 @@ aws s3 cp ${s3_location_runner_distribution} actions-runner.tar.gz
 tar xzf ./actions-runner.tar.gz
 rm -rf actions-runner.tar.gz
 
+%{ if runner_architecture == "arm64" ~}
 # Patch for ARM64 (no ICU install by default)
 yum install -y patch
 patch -p1 <<ICU_PATCH
@@ -69,6 +70,7 @@ diff -Naur a/bin/Runner.Worker.runtimeconfig.json b/bin/Runner.Worker.runtimecon
 \ No newline at end of file
 +}
 ICU_PATCH
+%{ endif ~}
 
 INSTANCE_ID=$(wget -q -O - http://169.254.169.254/latest/meta-data/instance-id)
 REGION=$(curl -s 169.254.169.254/latest/dynamic/instance-identity/document | jq -r .region)

modules/runners/variables.tf

@@ -184,3 +184,9 @@ variable "encryption" {
     encrypt    = bool
   })
 }
+
+ variable "runner_architecture" {
+  description = "The platform architecture of the runner instance_type."
+  type        = string
+  default     = "x64"
+ }