summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaiki Endo <te316e89@gmail.com>2019-11-08 00:32:04 +0900
committerGitHub <noreply@github.com>2019-11-08 00:32:04 +0900
commit64f2bf0072b4a42f6c7763e757caf68c3ac71893 (patch)
tree2047e6f51e52f3e7840f0e98aa26aa13fe523fdd
parent7e35922a1d282b1e3dadf037cd237be336b331fb (diff)
chore: update CI config to test on stable (#1747)
-rw-r--r--.cirrus.yml2
-rw-r--r--azure-pipelines.yml16
-rw-r--r--ci/azure-clippy.yml2
-rw-r--r--rust-toolchain2
4 files changed, 11 insertions, 11 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 0a2b18c8..afb761b7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -13,7 +13,7 @@ task:
setup_script:
- pkg install -y curl
- curl https://sh.rustup.rs -sSf --output rustup.sh
- - sh rustup.sh -y --profile minimal --default-toolchain beta
+ - sh rustup.sh -y --profile minimal --default-toolchain stable
- . $HOME/.cargo/env
- rustup target add i686-unknown-freebsd
- |
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e60090f7..8d76cde2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,20 +8,20 @@ jobs:
# Check formatting
- template: ci/azure-rustfmt.yml
parameters:
- rust: beta
+ rust: stable
name: rustfmt
# Apply clippy lints to all crates
- template: ci/azure-clippy.yml
parameters:
- rust: beta
+ rust: stable
name: clippy
# Test top level crate
- template: ci/azure-test-stable.yml
parameters:
name: test_tokio
- rust: beta
+ rust: stable
displayName: Test tokio
cross: true
crates:
@@ -33,7 +33,7 @@ jobs:
parameters:
name: test_linux
displayName: Test sub crates -
- rust: beta
+ rust: stable
crates:
- tokio-macros
- tokio-test
@@ -44,7 +44,7 @@ jobs:
- template: ci/azure-loom.yml
parameters:
name: loom
- rust: beta
+ rust: stable
crates:
- tokio
@@ -52,7 +52,7 @@ jobs:
- template: ci/azure-cross-compile.yml
parameters:
name: cross
- rust: beta
+ rust: stable
# # This represents the minimum Rust version supported by
# # Tokio. Updating this should be done in a dedicated PR and
@@ -69,11 +69,11 @@ jobs:
# - template: ci/azure-tsan.yml
# parameters:
# name: tsan
-# rust: beta
+# rust: stable
- template: ci/azure-deploy-docs.yml
parameters:
- rust: beta
+ rust: stable
dependsOn:
- rustfmt
- clippy
diff --git a/ci/azure-clippy.yml b/ci/azure-clippy.yml
index 349cd5d6..c4361556 100644
--- a/ci/azure-clippy.yml
+++ b/ci/azure-clippy.yml
@@ -12,5 +12,5 @@ jobs:
cargo clippy --version
displayName: Install clippy
- script: |
- cargo clippy --all --all-features -- -A clippy::mutex-atomic -A clippy::needless-doctest-main
+ cargo clippy --all --all-features -- -A clippy::mutex-atomic
displayName: cargo clippy --all
diff --git a/rust-toolchain b/rust-toolchain
index 65b2df87..2bf5ad04 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-beta
+stable