Skip to content

Commit

Permalink
Update cc crate to 1.0.48
Browse files Browse the repository at this point in the history
This change updates the cc crate to version 1.0.48.

Import subrepo cc/:cc at be9f2c1ae05b336aa3d07a4cbefdc1d88a3d8a91
  • Loading branch information
d-e-s-o committed Nov 1, 2019
1 parent 49be10a commit 9091de4
Show file tree
Hide file tree
Showing 20 changed files with 517 additions and 328 deletions.
124 changes: 124 additions & 0 deletions cc/.github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
name: CI
on: [push, pull_request]

jobs:
test:
name: Test
runs-on: ${{ matrix.os }}
strategy:
matrix:
build: [stable, beta, nightly, linux32, macos, aarch64-ios, win32, win64, mingw32, mingw64, windows-2016]
include:
- build: stable
os: ubuntu-latest
rust: stable
target: x86_64-unknown-linux-gnu
- build: beta
os: ubuntu-latest
rust: beta
target: x86_64-unknown-linux-gnu
- build: nightly
os: ubuntu-latest
rust: nightly
target: x86_64-unknown-linux-gnu
- build: linux32
os: ubuntu-latest
rust: stable
target: i686-unknown-linux-gnu
- build: macos
os: macos-latest
rust: stable
target: x86_64-apple-darwin
- build: aarch64-ios
os: macos-latest
rust: stable
target: aarch64-apple-ios
no_run: --no-run
- build: win32
os: windows-2016
rust: stable-i686-msvc
target: i686-pc-windows-msvc
- build: win64
os: windows-latest
rust: stable
target: x86_64-pc-windows-msvc
- build: mingw32
os: windows-latest
rust: stable-i686-gnu
target: i686-pc-windows-gnu
- build: mingw64
os: windows-latest
rust: stable-x86_64-gnu
target: x86_64-pc-windows-gnu
- build: windows-2016
os: windows-2016
rust: stable-x86_64
target: x86_64-pc-windows-msvc
steps:
- uses: actions/checkout@master
- name: Install Rust (rustup)
run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
if: matrix.os != 'macos-latest'
shell: bash
- name: Install Rust (macos)
run: |
curl https://sh.rustup.rs | sh -s -- -y
echo "##[add-path]$HOME/.cargo/bin"
if: matrix.os == 'macos-latest'
- run: rustup target add ${{ matrix.target }}
- name: Install g++-multilib
run: |
set -e
# Remove the ubuntu-toolchain-r/test PPA, which is added by default.
# Some packages were removed, and this is causing the g++multilib
# install to fail. Similar issue:
# https://github.com/scikit-learn/scikit-learn/issues/13928.
sudo add-apt-repository --remove ppa:ubuntu-toolchain-r/test
sudo apt-get install g++-multilib
if: matrix.build == 'linux32'
- run: cargo build
- run: cargo test ${{ matrix.no_run }}
- run: cargo test ${{ matrix.no_run }} --features parallel
- run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }}
- run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }} --features parallel
- run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }} --release

msrv:
name: MSRV
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
steps:
- uses: actions/checkout@master
- name: Install Rust
run: rustup update 1.31.0 --no-self-update && rustup default 1.31.0
shell: bash
- run: cargo build

rustfmt:
name: Rustfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Install Rust
run: rustup update stable && rustup default stable && rustup component add rustfmt
- run: cargo fmt -- --check

publish_docs:
name: Publish Documentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Install Rust
run: rustup update stable && rustup default stable
- name: Build documentation
run: cargo doc --no-deps --all-features
- name: Publish documentation
run: |
cd target/doc
git init
git add .
git -c user.name='ci' -c user.email='ci' commit -m init
git push -f -q https://git:${{ secrets.github_token }}@github.com/${{ github.repository }} HEAD:gh-pages
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
10 changes: 6 additions & 4 deletions cc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cc"
version = "1.0.40"
version = "1.0.48"
authors = ["Alex Crichton <[email protected]>"]
license = "MIT/Apache-2.0"
repository = "https://github.com/alexcrichton/cc-rs"
Expand All @@ -15,12 +15,14 @@ keywords = ["build-dependencies"]
readme = "README.md"
categories = ["development-tools::build-utils"]
exclude = ["/.travis.yml", "/appveyor.yml"]
edition = "2018"

[dependencies]
rayon = { version = "1.0", optional = true }
num_cpus = { version = "1.10", optional = true }
jobserver = { version = "0.1.16", optional = true }

[features]
parallel = ["rayon"]
parallel = ["num_cpus", "jobserver"]

[dev-dependencies]
tempdir = "0.3"
tempfile = "3"
8 changes: 0 additions & 8 deletions cc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

A library to compile C/C++/assembly into a Rust library/application.

[![Build Status](https://dev.azure.com/alexcrichton/cc-rs/_apis/build/status/alexcrichton.cc-rs?branchName=master)](https://dev.azure.com/alexcrichton/cc-rs/_build/latest?definitionId=5&branchName=master)

[Documentation](https://docs.rs/cc)

A simple library meant to be used as a build dependency with Cargo packages in
Expand All @@ -28,8 +26,6 @@ Next up, you'll want to write a build script like so:
```rust,no_run
// build.rs
extern crate cc;
fn main() {
cc::Build::new()
.file("foo.c")
Expand Down Expand Up @@ -143,8 +139,6 @@ required varies per platform, but there are three broad categories:
`Build`:

```rust,no_run
extern crate cc;
fn main() {
cc::Build::new()
.cpp(true) // Switch to C++ library compilation.
Expand All @@ -163,8 +157,6 @@ linked to the crate target.
on `Build` (currently for GNU/Clang toolchains only):

```rust,no_run
extern crate cc;
fn main() {
cc::Build::new()
// Switch to CUDA C++ library compilation using NVCC.
Expand Down
105 changes: 0 additions & 105 deletions cc/azure-pipelines.yml

This file was deleted.

1 change: 1 addition & 0 deletions cc/cc-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "cc-test"
version = "0.1.0"
authors = ["Alex Crichton <[email protected]>"]
edition = "2018"

[lib]
name = "cc_test"
Expand Down
2 changes: 0 additions & 2 deletions cc/cc-test/build.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
extern crate cc;

use std::env;
use std::fs;
use std::path::PathBuf;
Expand Down
2 changes: 0 additions & 2 deletions cc/cc-test/tests/all.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
extern crate cc_test;

use cc_test::*;

#[link(name = "OptLinkage", kind = "static")]
Expand Down
38 changes: 0 additions & 38 deletions cc/ci/azure-install-rust.yml

This file was deleted.

28 changes: 0 additions & 28 deletions cc/ci/azure-steps.yml

This file was deleted.

Loading

0 comments on commit 9091de4

Please sign in to comment.