Get Xcode version by macOS release (NO_JIRA)

ccdc-opensource · Jun 7, 2024 · cad8529 · cad8529
1 parent 35904ce
commit cad8529
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml
@@ -1,18 +1,23 @@
 ---
-- name: Downlaod Xcode v{{ xcode_version }}
-  ansible.builtin.shell: >
-    jf rt dl
-    --flat
-    --fail-no-op
-    --retries=100
-    --url="https://artifactory.ccdc.cam.ac.uk/artifactory"
-    --user={{ ansible_deployment_artifactory_user }}
-    --props="XCODE_VERSION={{ xcode_version }}"
-    --password="{{ ansible_deployment_artifactory_key }}"
-    "ccdc-3rdparty-macos-xcode-installers/"
-    /tmp/xcode-{{ xcode_version }}.xip
+- name: Set Xcode version for macOS {{ ansible_distribution_major_version }}
+  ansible.builtin.set_fact:
+    xcode_version: "{{ xcode_versions_by_macos[ansible_distribution_major_version] }}"
+
+- name: Download Xcode v{{ xcode_version }}
+  ansible.builtin.command:
+    cmd: >
+      jf rt dl
+        --flat
+        --fail-no-op
+        --retries=100
+        --url="https://artifactory.ccdc.cam.ac.uk/artifactory"
+        --user={{ ansible_deployment_artifactory_user }}
+        --props="XCODE_VERSION={{ xcode_version }}"
+        --password="{{ ansible_deployment_artifactory_key }}"
+        "ccdc-3rdparty-macos-xcode-installers/"
+        /tmp/xcode-{{ xcode_version }}.xip
   environment:
-    PATH: "/opt/homebrew/bin:/usr/local/bin:{{ ansible_env.PATH }}"
+    PATH: "/usr/local/bin:/opt/homebrew/bin:{{ ansible_env.PATH }}"
     CI: "true"
     JFROG_CLI_OFFER_CONFIG: "false"
   args: