Skip to content
This repository was archived by the owner on Sep 4, 2020. It is now read-only.

Commit 9eeda00

Browse files
Merge pull request #1 from rust-wii/master
Push master into wii
2 parents a2870ad + e588290 commit 9eeda00

File tree

44 files changed

+4265
-603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+4265
-603
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
task:
22
name: stable x86_64-unknown-freebsd-11
33
freebsd_instance:
4-
image: freebsd-11-2-release-amd64
4+
image: freebsd-11-3-stable-amd64-v20190801
55
setup_script:
66
- pkg install -y curl
77
- curl https://sh.rustup.rs -sSf --output rustup.sh

.travis.yml

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "libc"
3-
version = "0.2.60"
3+
version = "0.2.61"
44
authors = ["The Rust Project Developers"]
55
license = "MIT OR Apache-2.0"
66
readme = "README.md"
@@ -10,7 +10,7 @@ documentation = "http://doc.rust-lang.org/libc"
1010
keywords = ["libc", "ffi", "bindings", "operating", "system" ]
1111
categories = ["external-ffi-bindings", "no-std", "os"]
1212
build = "build.rs"
13-
exclude = ["/ci/*", "/.travis.yml", "/appveyor.yml"]
13+
exclude = ["/ci/*", "/azure-pipelines.yml"]
1414
description = """
1515
Raw FFI bindings to platform libraries like libc.
1616
"""

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Travis-CI Status]][Travis-CI] [![Appveyor Status]][Appveyor] [![Cirrus-CI Status]][Cirrus-CI] [![Latest Version]][crates.io] [![Documentation]][docs.rs] ![License]
1+
[![Azure Status]][Azure] [![Cirrus-CI Status]][Cirrus-CI] [![Latest Version]][crates.io] [![Documentation]][docs.rs] ![License]
22

33
libc - Raw FFI bindings to platforms' system libraries
44
====
@@ -91,10 +91,8 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
9191
for inclusion in `libc` by you, as defined in the Apache-2.0 license, shall be
9292
dual licensed as above, without any additional terms or conditions.
9393

94-
[Travis-CI]: https://travis-ci.com/rust-lang/libc
95-
[Travis-CI Status]: https://travis-ci.com/rust-lang/libc.svg?branch=master
96-
[Appveyor]: https://ci.appveyor.com/project/rust-lang-libs/libc
97-
[Appveyor Status]: https://ci.appveyor.com/api/projects/status/github/rust-lang/libc?svg=true
94+
[Azure Status]: https://dev.azure.com/rust-lang2/libc/_apis/build/status/rust-lang.libc?branchName=master
95+
[Azure]: https://dev.azure.com/rust-lang2/libc/_build/latest?definitionId=1&branchName=master
9896
[Cirrus-CI]: https://cirrus-ci.com/github/rust-lang/libc
9997
[Cirrus-CI Status]: https://api.cirrus-ci.com/github/rust-lang/libc.svg
10098
[crates.io]: https://crates.io/crates/libc

appveyor.yml

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

build.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,15 @@ fn main() {
1616
}
1717

1818
if env::var("LIBC_CI").is_ok() {
19+
if let Some(11) = which_freebsd() {
20+
println!("cargo:rustc-cfg=freebsd11");
21+
}
1922
if let Some(12) = which_freebsd() {
2023
println!("cargo:rustc-cfg=freebsd12");
2124
}
25+
if let Some(13) = which_freebsd() {
26+
println!("cargo:rustc-cfg=freebsd13");
27+
}
2228
}
2329

2430
// Rust >= 1.15 supports private module use:
@@ -100,6 +106,7 @@ fn which_freebsd() -> Option<i32> {
100106
match &stdout {
101107
s if s.starts_with("11") => Some(11),
102108
s if s.starts_with("12") => Some(12),
109+
s if s.starts_with("13") => Some(13),
103110
_ => None,
104111
}
105112
}

ci/README.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,12 @@ this project.
88

99
First up, let's talk about the files in this directory:
1010

11-
* `run-travis.sh` - a shell script run by all Travis builders, this is
12-
responsible for setting up the rest of the environment such as installing new
13-
packages, downloading Rust target libraries, etc.
11+
* `run-docker.sh` - a shell script run by most builders, it will execute
12+
`run.sh` inside a Docker container configured for the target.
1413

1514
* `run.sh` - the actual script which runs tests for a particular architecture.
16-
Called from the `run-travis.sh` script this will run all tests for the target
17-
specified.
1815

19-
* `cargo-config` - Cargo configuration of linkers to use copied into place by
20-
the `run-travis.sh` script before builds are run.
21-
22-
* `dox.sh` - script called from `run-travis.sh` on only the linux 64-bit nightly
23-
Travis bots to build documentation for this crate.
16+
* `dox.sh` - build the documentation of the crate and publish it to gh-pages.
2417

2518
* `landing-page-*.html` - used by `dox.sh` to generate a landing page for all
2619
architectures' documentation.

0 commit comments

Comments
 (0)