Fix bug with x86 watchOS simulator

sonos · Feb 22, 2024 · 121354f · 121354f
1 parent a6115e0
commit 121354f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.travis.sh b/.travis.sh
@@ -170,6 +170,7 @@ then
      if [ "$(uname -m)" = "arm64" ]; then
          tests_sequence_unstable_target ${TV_SIM_ID} auto-tvos-aarch64-sim
      else
+         # The x86 tvOS simulator tripple does not end in -sim.
          tests_sequence_unstable_target ${TV_SIM_ID} auto-tvos-x86_64
      fi
      xcrun simctl delete $TV_SIM_ID
@@ -183,7 +184,7 @@ then
      if [ "$(uname -m)" = "arm64" ]; then
          tests_sequence_unstable_target ${WATCHOS_SIM_ID} auto-watchos-aarch64-sim
      else
-         tests_sequence_unstable_target ${WATCHOS_SIM_ID} auto-watchos-x86_64
+         tests_sequence_unstable_target ${WATCHOS_SIM_ID} auto-watchos-x86_64-sim
      fi
      xcrun simctl delete $WATCHOS_SIM_ID
      rustup default stable

diff --git a/dinghy-lib/src/apple/mod.rs b/dinghy-lib/src/apple/mod.rs
@@ -129,10 +129,15 @@ impl PlatformManager for WatchosManager {
         .iter()
         .map(|arch| {
             let id = format!("auto-watchos-{}", arch);
-            let rustc_triple = if *arch != "aarch64-sim" {
-                format!("{}-apple-watchos", arch)
-            } else {
+
+            // Apple watch simulator targets are x86_64-apple-watchos-sim or
+            // aarch64-apple-watchos-sim
+            let rustc_triple = if *arch == "aarch64-sim" {
                 format!("aarch64-apple-watchos-sim")
+            } else if *arch == "x86_64-sim" {
+                format!("x86_64-apple-watchos-sim")
+            } else {
+                format!("{}-apple-watchos", arch)
             };
             let simulator = if *arch == "x86_64-sim" || *arch == "aarch64-sim" {
                 Some(AppleSimulatorType::Watchos)