From 31bc126bc459a409918148ba68a13e4bbbae978b Mon Sep 17 00:00:00 2001
From: fedor <fedor.korotkov@gmail.com>
Date: Sun, 7 Apr 2024 20:10:13 -0400
Subject: [PATCH] fixes

---
 .cirrus.yml             | 9 ++++-----
 templates/xcode.pkr.hcl | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5b7e2f0..e4d5079 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -20,7 +20,6 @@ defaults: &defaults
     - tart --version
     - packer --version
 
-
 task:
   name: "Update Vanilla Images"
   only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH && changesInclude("templates/vanilla-sonoma.pkr.hcl")
@@ -59,6 +58,7 @@ task:
 task:
   name: "Update Xcode Images ($MACOS_VERSION $XCODE_VERSION)"
   depends_on: update-base
+  only_if: $CIRRUS_CRON == "monthly" # Every first Saturday of a month at 14 UTC
   env:
     matrix:
       - MACOS_VERSION: sonoma
@@ -73,13 +73,12 @@ task:
         LATEST: true
       - MACOS_VERSION: ventura
         XCODE_VERSION: 14.2
-  only_if: $CIRRUS_CRON == "monthly" # Every first Saturday of a month at 14 UTC
   <<: *defaults
   pull_base_script:
     - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
   build_xcode_script:
     - packer init templates/xcode.pkr.hcl
-    - packer build -var macos_version="$MACOS_VERSION" -var xcode_version="[$XCODE_VERSION]" templates/xcode.pkr.hcl
+    - packer build -var macos_version="$MACOS_VERSION" -var xcode_version="[\"$XCODE_VERSION\"]" templates/xcode.pkr.hcl
   push_script: |
     if [[ -z "$LATEST" ]]
     then
@@ -103,7 +102,7 @@ task:
     - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
   build_xcode_script:
     - packer init templates/xcode.pkr.hcl
-    - packer build -var tag=runner -var disk_size=130 -var macos_version="$MACOS_VERSION" -var xcode_version="[$XCODE_VERSIONS]" templates/xcode.pkr.hcl
+    - packer build -var tag=runner -var disk_size=130 -var macos_version="'$MACOS_VERSION'" -var xcode_version="[$XCODE_VERSIONS]" templates/xcode.pkr.hcl
   push_script: |
     tart push "$MACOS_VERSION-xcode:runner" ghcr.io/cirruslabs/macos-runner:$MACOS_VERSION
   always:
@@ -120,7 +119,7 @@ task:
     - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
   build_script:
     - packer init templates/xcode.pkr.hcl
-    - packer build -var macos_version="$MACOS_VERSION" -var xcode_version="[$CIRRUS_TAG]" templates/xcode.pkr.hcl
+    - packer build -var macos_version="$MACOS_VERSION" -var xcode_version="[\"$CIRRUS_TAG\"]" templates/xcode.pkr.hcl
   push_script: |
     if [[ $CIRRUS_TAG == *"beta"* ]]
     then
diff --git a/templates/xcode.pkr.hcl b/templates/xcode.pkr.hcl
index cacd0bf..71c3ecf 100644
--- a/templates/xcode.pkr.hcl
+++ b/templates/xcode.pkr.hcl
@@ -32,7 +32,8 @@ variable "android_sdk_tools_version" {
 
 source "tart-cli" "tart" {
   vm_base_name = "ghcr.io/cirruslabs/macos-${var.macos_version}-base:latest"
-  vm_name      = "${var.macos_version}-xcode:${var.tag != "" ? var.tag : var.xcode_version[-1]}"
+  // use tag or the last element of the xcode_version list
+  vm_name      = "${var.macos_version}-xcode:${var.tag != "" ? var.tag : var.xcode_version[length(var.xcode_version) - 1]}"
   cpu_count    = 4
   memory_gb    = 8
   disk_size_gb = var.disk_size