From 4b10c8818c4b101354adc6fdac75fe72a684a340 Mon Sep 17 00:00:00 2001 From: Jay Date: Wed, 22 Jul 2020 15:39:21 +0800 Subject: [PATCH] *: extra cleanup (#3) - Skip publishing docs on master - Remove appveyor CI Signed-off-by: Jay Lee --- .appveyor.yml | 34 ---------------------------------- .travis.yml | 6 ------ Cargo.toml | 3 +-- README.md | 5 +---- jemalloc-ctl/Cargo.toml | 1 - jemalloc-ctl/README.md | 5 +---- jemalloc-sys/Cargo.toml | 1 - jemalloc-sys/README.md | 5 +---- jemallocator-global/Cargo.toml | 3 +-- jemallocator-global/README.md | 4 +--- 10 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 760e301..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,34 +0,0 @@ -environment: - # We don't want to do identical comdat folding as it messes up the ability to - # generate lossless backtraces in some cases. This is enabled by rustc by - # default so pass a flag to disable it to ensure our tests work ok. - RUSTFLAGS: -Clink-args=/OPT:NOICF - - matrix: - - TARGET: x86_64-pc-windows-gnu - MSYSTEM: MINGW64 - CPU: x86_64 - - TARGET: i686-pc-windows-gnu - MSYSTEM: MINGW32 - CPU: i686 - -matrix: - allow_failures: - - TARGET: x86_64-pc-windows-gnu - - TARGET: i686-pc-windows-gnu - -install: - - git submodule update --init --recursive - - set PATH=c:\msys64\%MSYSTEM%\bin;c:\msys64\usr\bin;%PATH% - - pacman --noconfirm -Syu mingw-w64-%CPU%-make - - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe - - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly - - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - - rustc -vV - - cargo -vV -build: false -test_script: sh ci\run.sh - -branches: - only: - - master diff --git a/.travis.yml b/.travis.yml index 70eee01..6edfe04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,12 +61,6 @@ jobs: - name: "Documentation" install: true script: RUSTDOCFLAGS="--cfg jemallocator_docs" cargo doc - deploy: - provider: script - script: curl -LsSf https://git.io/fhJ8n | rustc - && (cd target/doc && ../../rust_out) - cleanup: true - on: - branch: master - name: "rustfmt" install: true rust: nightly diff --git a/Cargo.toml b/Cargo.toml index e03c783..26c37a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,6 @@ A Rust allocator backed by jemalloc edition = "2018" [badges] -appveyor = { repository = "tikv/jemallocator" } travis-ci = { repository = "tikv/jemallocator" } codecov = { repository = "tikv/jemallocator" } is-it-maintained-issue-resolution = { repository = "tikv/jemallocator" } @@ -56,5 +55,5 @@ unprefixed_malloc_on_supported_platforms = ["tikv-jemalloc-sys/unprefixed_malloc disable_initial_exec_tls = ["tikv-jemalloc-sys/disable_initial_exec_tls"] [package.metadata.docs.rs] -features = [ "alloc_trait" ] +features = [] rustdoc-args = [ "--cfg", "jemallocator_docs" ] diff --git a/README.md b/README.md index 4e55374..65ec905 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # tikv-jemallocator -[![Travis-CI Status]][travis] [![Appveyor Status]][appveyor] [![Latest Version]][crates.io] [![docs]][docs.rs] +[![Travis-CI Status]][travis] [![Latest Version]][crates.io] [![docs]][docs.rs] This project is a simplified fork of [jemallocator](https://github.com/gnzlbg/jemallocator) focus on server. @@ -20,7 +20,6 @@ The `jemalloc` support ecosystem consists of the following crates: ## Documentation * [Latest release (docs.rs)][docs.rs] -* [Master branch][master_docs] To use `tikv-jemallocator` add it as a dependency: @@ -91,8 +90,6 @@ shall be dual licensed as above, without any additional terms or conditions. [travis]: https://travis-ci.com/tikv/jemallocator [Travis-CI Status]: https://travis-ci.com/tikv/jemallocator.svg?branch=master -[appveyor]: https://ci.appveyor.com/project/tikv/jemallocator/branch/master -[Appveyor Status]: https://ci.appveyor.com/api/projects/status/github/tikv/jemallocator?branch=master&svg=true [Latest Version]: https://img.shields.io/crates/v/tikv-jemallocator.svg [crates.io]: https://crates.io/crates/tikv-jemallocator [docs]: https://docs.rs/tikv-jemallocator/badge.svg diff --git a/jemalloc-ctl/Cargo.toml b/jemalloc-ctl/Cargo.toml index a5f8a91..6980c86 100644 --- a/jemalloc-ctl/Cargo.toml +++ b/jemalloc-ctl/Cargo.toml @@ -19,7 +19,6 @@ A safe wrapper over jemalloc's control and introspection APIs edition = "2018" [badges] -appveyor = { repository = "tikv/jemallocator" } travis-ci = { repository = "tikv/jemallocator" } codecov = { repository = "tikv/jemallocator" } is-it-maintained-issue-resolution = { repository = "tikv/jemallocator" } diff --git a/jemalloc-ctl/README.md b/jemalloc-ctl/README.md index 0a0b5c9..11dde09 100644 --- a/jemalloc-ctl/README.md +++ b/jemalloc-ctl/README.md @@ -1,13 +1,12 @@ # jemalloc-ctl -[![Travis-CI Status]][travis] [![Appveyor Status]][appveyor] [![Latest Version]][crates.io] [![docs]][docs.rs] +[![Travis-CI Status]][travis] [![Latest Version]][crates.io] [![docs]][docs.rs] > A safe wrapper over `jemalloc`'s `mallctl*()` control and introspection APIs. ## Documentation * [Latest release (docs.rs)][docs.rs] -* [master branch`][master_docs] ## Platform support @@ -65,8 +64,6 @@ shall be dual licensed as above, without any additional terms or conditions. [`tikv-jemallocator`]: https://github.com/tikv/jemallocator [travis]: https://travis-ci.com/tikv/jemallocator [Travis-CI Status]: https://travis-ci.com/tikv/jemallocator.svg?branch=master -[appveyor]: https://ci.appveyor.com/project/tikv/jemallocator/branch/master -[Appveyor Status]: https://ci.appveyor.com/api/projects/status/github/tikv/jemallocator?branch=master&svg=true [Latest Version]: https://img.shields.io/crates/v/tikv-jemallocator.svg [crates.io]: https://crates.io/crates/tikv-jemallocator [docs]: https://docs.rs/tikv-jemallocator/badge.svg diff --git a/jemalloc-sys/Cargo.toml b/jemalloc-sys/Cargo.toml index e275360..c7c36ae 100644 --- a/jemalloc-sys/Cargo.toml +++ b/jemalloc-sys/Cargo.toml @@ -20,7 +20,6 @@ Rust FFI bindings to jemalloc edition = "2018" [badges] -appveyor = { repository = "tikv/jemallocator" } travis-ci = { repository = "tikv/jemallocator" } codecov = { repository = "tikv/jemallocator" } is-it-maintained-issue-resolution = { repository = "tikv/jemallocator" } diff --git a/jemalloc-sys/README.md b/jemalloc-sys/README.md index 795e0b2..de93e76 100644 --- a/jemalloc-sys/README.md +++ b/jemalloc-sys/README.md @@ -1,6 +1,6 @@ # jemalloc-sys - Rust bindings to the `jemalloc` C library -[![Travis-CI Status]][travis] [![Appveyor Status]][appveyor] [![Latest Version]][crates.io] [![docs]][docs.rs] +[![Travis-CI Status]][travis] [![Latest Version]][crates.io] [![docs]][docs.rs] > Note: the Rust allocator API is implemented for `jemalloc` in the > [`tikv-jemallocator`](https://crates.io/crates/tikv-jemallocator) crate. @@ -8,7 +8,6 @@ ## Documentation * [Latest release (docs.rs)][docs.rs] -* [master branch`][master_docs] `jemalloc` is a general purpose memory allocator, its documentation @@ -165,8 +164,6 @@ shall be dual licensed as above, without any additional terms or conditions. [travis]: https://travis-ci.com/tikv/jemallocator [Travis-CI Status]: https://travis-ci.com/tikv/jemallocator.svg?branch=master -[appveyor]: https://ci.appveyor.com/project/tikv/jemallocator/branch/master -[Appveyor Status]: https://ci.appveyor.com/api/projects/status/github/tikv/jemallocator?branch=master&svg=true [Latest Version]: https://img.shields.io/crates/v/tikv-jemallocator.svg [crates.io]: https://crates.io/crates/tikv-jemallocator [docs]: https://docs.rs/tikv-jemallocator/badge.svg diff --git a/jemallocator-global/Cargo.toml b/jemallocator-global/Cargo.toml index ce18bce..fb75d42 100644 --- a/jemallocator-global/Cargo.toml +++ b/jemallocator-global/Cargo.toml @@ -18,8 +18,7 @@ description = """ Sets `jemalloc` as the `#[global_allocator]` """ - [badges] -appveyor = { repository = "tikv/jemallocator" } +[badges] travis-ci = { repository = "tikv/jemallocator" } codecov = { repository = "tikv/jemallocator" } is-it-maintained-issue-resolution = { repository = "tikv/jemallocator" } diff --git a/jemallocator-global/README.md b/jemallocator-global/README.md index 76a9a56..d6acd3e 100644 --- a/jemallocator-global/README.md +++ b/jemallocator-global/README.md @@ -1,6 +1,6 @@ # jemallocator-global -[![Travis-CI Status]][travis] [![Appveyor Status]][appveyor] [![Latest Version]][crates.io] [![docs]][docs.rs] +[![Travis-CI Status]][travis] [![Latest Version]][crates.io] [![docs]][docs.rs] > Sets `jemalloc` as the `#[global allocator]` on targets that support it. @@ -51,8 +51,6 @@ shall be dual licensed as above, without any additional terms or conditions. [travis]: https://travis-ci.com/tikv/jemallocator [Travis-CI Status]: https://travis-ci.com/tikv/jemallocator.svg?branch=master -[appveyor]: https://ci.appveyor.com/project/tikv/jemallocator/branch/master -[Appveyor Status]: https://ci.appveyor.com/api/projects/status/github/tikv/jemallocator?branch=master&svg=true [Latest Version]: https://img.shields.io/crates/v/tikv-jemallocator.svg [crates.io]: https://crates.io/crates/tikv-jemallocator [docs]: https://docs.rs/tikv-jemallocator/badge.svg