Skip to content

Commit 80700fc

Browse files
committed
Use cargo workspace
1 parent 2940ea9 commit 80700fc

File tree

22 files changed

+27
-44
lines changed

22 files changed

+27
-44
lines changed

.travis.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
language: rust
22

3-
sudo: false
3+
rust:
4+
- nightly
5+
- beta
6+
- stable
7+
8+
cache: cargo
49

510
script:
6-
- ./bin/cargo test
11+
- cargo build --all
12+
- cargo test --all

Cargo.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[workspace]
2+
members = [
3+
"gl",
4+
"gl_generator",
5+
"tests/test_add_registries",
6+
"tests/test_gen_symbols",
7+
"tests/test_no_warnings",
8+
"tests/test_symbols",
9+
"tests/test_unstable_api",
10+
"tests/test_with_extensions",
11+
"khronos_api",
12+
]

bin/cargo

Lines changed: 0 additions & 35 deletions
This file was deleted.

gl/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ readme = "README.md"
1717
gl_generator = { version = "0.5.2", path = "../gl_generator" }
1818

1919
[dev-dependencies]
20-
glutin = "0.4"
20+
glutin = "0.7"

gl_tests/test_add_registries/Cargo.toml renamed to tests/test_add_registries/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
2-
# we don't include some metadata to avoid accidental publishes
32
name = "test_add_registries"
43
version = "0.0.0"
54
build = "build.rs"
5+
publish = false
66

77
[lib]
88
path = "lib.rs"

gl_tests/test_gen_symbols/Cargo.toml renamed to tests/test_gen_symbols/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
2-
# we don't include some metadata to avoid accidental publishes
32
name = "test_gen_symbols"
43
version = "0.0.0"
54
build = "build.rs"
5+
publish = false
66

77
[lib]
88
path = "lib.rs"
File renamed without changes.
File renamed without changes.

gl_tests/test_no_warnings/Cargo.toml renamed to tests/test_no_warnings/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
2-
# we don't include some metadata to avoid accidental publishes
32
name = "test_no_warnings"
43
version = "0.0.0"
54
build = "build.rs"
5+
publish = false
66

77
[lib]
88
path = "lib.rs"
File renamed without changes.
File renamed without changes.

gl_tests/test_symbols/Cargo.toml renamed to tests/test_symbols/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
2-
# we don't include some metadata to avoid accidental publishes
32
name = "test_symbols"
43
version = "0.0.0"
54
build = "build.rs"
5+
publish = false
66

77
[lib]
88
path = "lib.rs"
File renamed without changes.
File renamed without changes.

gl_tests/test_unstable_api/Cargo.toml renamed to tests/test_unstable_api/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
2-
# we don't include some metadata to avoid accidental publishes
32
name = "test_unstable_api"
43
version = "0.0.0"
54
build = "build.rs"
5+
publish = false
66

77
[lib]
88
path = "lib.rs"
File renamed without changes.

gl_tests/test_with_extensions/Cargo.toml renamed to tests/test_with_extensions/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
2-
# we don't include some metadata to avoid accidental publishes
32
name = "test_with_extensions"
43
version = "0.0.0"
54
build = "build.rs"
5+
publish = false
66

77
[lib]
88
path = "lib.rs"

0 commit comments

Comments
 (0)