From 18b790fba8dabb86ce590fcf484cc7f20a47425e Mon Sep 17 00:00:00 2001 From: Seivan Heidari Date: Fri, 30 Aug 2019 14:54:29 +0200 Subject: [PATCH] Adding iOS matrix for CI. --- .travis.yml | 8 ++++---- wgpu-native/Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5fa7ea9e..f0c1aac09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,10 +32,10 @@ matrix: compiler: clang # iPhoneOS 64bit - #- env: TARGET=aarch64-apple-ios - # os: osx - # osx_image: xcode9.4 - # rust: nightly + - env: TARGET=aarch64-apple-ios + os: osx + osx_image: xcode11 + rust: stable addons: apt: diff --git a/wgpu-native/Cargo.toml b/wgpu-native/Cargo.toml index c44fc6daa..4f90b2b86 100644 --- a/wgpu-native/Cargo.toml +++ b/wgpu-native/Cargo.toml @@ -37,10 +37,10 @@ rendy-descriptor = "0.4" serde = { version = "1.0", features = ["serde_derive"], optional = true } vec_map = "0.8" -[target.'cfg(unix)'.dependencies] +[target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies] gfx-backend-vulkan = { version = "0.3.0", features = ["x11"] } -[target.'cfg(not(unix))'.dependencies] +[target.'cfg(any(not(unix), target_os = "ios", target_os = "macos"))'.dependencies] gfx-backend-vulkan = "0.3" [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]