Skip to content

Commit 7b0217d

Browse files
bors[bot]kvark
andcommitted
Merge gfx-rs#163
163: Remove Rust wrapper and examples r=kvark a=kvark Fixes gfx-rs#160 Closes gfx-rs#60 Everything specific to Rust API is about to be moved to https://github.com/gfx-rs/wgpu-rs It would let this project to be a proper mirror of mozilla-central piece, and it would encourage other authors to experiment with different approaches to Rust wrappers (i.e. borrowing versus non-borrowing). cc @jdashg Co-authored-by: Dzmitry Malyshau <[email protected]>
2 parents 97d1ba3 + 540451a commit 7b0217d

31 files changed

+105
-3145
lines changed

.travis.yml

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
language: rust
2+
sudo: false
3+
dist: xenial
24

35
matrix:
46
include:
57
# Linux 64bit
68
- os: linux
79
rust: stable
810
compiler: gcc
9-
- os: linux
10-
rust: nightly
11-
compiler: gcc
11+
#TODO: unlock when libglfw3 on Ubuntu comes with Vulkan support
12+
# or when we add a GL backend.
13+
#- os: linux
14+
# rust: nightly
15+
# compiler: gcc
1216
# Windows 64bit
1317
- os: windows
1418
rust: stable
@@ -19,28 +23,39 @@ matrix:
1923
rust: stable
2024
osx_image: xcode9.4
2125
compiler: clang
22-
#- env: MACOSX_DEPLOYMENT_TARGET=10.9
23-
# os: osx
24-
# rust: nightly
25-
# osx_image: xcode9.4
26-
# compiler: clang
26+
- env: MACOSX_DEPLOYMENT_TARGET=10.9
27+
os: osx
28+
rust: nightly
29+
osx_image: xcode9.4
30+
compiler: clang
2731

2832
# iPhoneOS 64bit
2933
#- env: TARGET=aarch64-apple-ios
3034
# os: osx
3135
# osx_image: xcode9.4
3236
# rust: nightly
3337

38+
addons:
39+
apt:
40+
packages:
41+
- cmake
42+
- libglfw3-dev
43+
homebrew:
44+
update: true
45+
packages:
46+
- cmake
47+
- glfw3
48+
choco:
49+
packages:
50+
- make
51+
3452
branches:
3553
except:
3654
- staging.tmp
3755

3856
before_install:
39-
# Do not run bors builds against the nightly compiler.
40-
# We want to find out about nightly bugs, so they're done in master, but we don't block on them.
41-
- if [[ $TRAVIS_RUST_VERSION == "nightly" && $TRAVIS_BRANCH == "staging" ]]; then exit; fi
4257
- if [[ $TRAVIS_OS_NAME == "windows" ]]; then choco install make; fi
4358

4459
script:
4560
- cargo test
46-
- if [[ $TRAVIS_OS_NAME == "osx" ]]; then (brew update && brew upgrade cmake && brew install glfw3 && cargo install cbindgen && make ffi-examples); fi
61+
- if [[ $TRAVIS_RUST_VERSION == "nightly" ]]; then cargo +nightly install cbindgen && make VERBOSE=1; fi

0 commit comments

Comments
 (0)