From b08342e3622152a5ba239484ab518fdd1c6cc74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Sinan=20A=C4=9Facan?= Date: Thu, 8 Oct 2020 17:56:34 +0300 Subject: [PATCH] Switch to stable toolchain Fixes #241 --- .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/release.yml | 4 ++-- CHANGELOG.md | 5 +++++ README.md | 4 ++-- rust-toolchain | 2 +- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7421cd4..bfdf199a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,10 +9,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Get nightly toolchain + - name: Get stable toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: stable components: rustfmt override: true @@ -36,10 +36,10 @@ jobs: sudo apt-get update sudo apt-get install libdbus-1-dev pkg-config libssl-dev - - name: Get nightly toolchain + - name: Get stable toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: stable components: rustfmt override: true @@ -55,10 +55,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Get nightly toolchain + - name: Get stable toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: stable components: rustfmt override: true @@ -74,10 +74,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Get nightly toolchain + - name: Get stable toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: stable components: rustfmt override: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c81ad11..fc264283 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,10 +30,10 @@ jobs: draft: true prerelease: true - - name: Get nightly toolchain + - name: Get stable toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: stable target: x86_64-unknown-linux-musl components: rustfmt override: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d80088a..6773fa5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# Unreleased + +- It's now possible to build tiny with stable Rust 1.47.0 or newer. Previously + tiny required nightly toolchain. (#241) + # 2020/09/20: 0.7.0 Thanks to @trevarj, @kennylevinsen and @LordMZTE for contributing to this diff --git a/README.md b/README.md index a49c8c37..3bb7a288 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,8 @@ tiny is an IRC client written in Rust. ## Installation -For pre-built binaries see [releases]. To build from source install Rust nightly -toolchain. By default tiny uses [rustls] for TLS support, and desktop +For pre-built binaries see [releases]. To build from source make sure you have +Rust 1.47.0 or newer. By default tiny uses [rustls] for TLS support, and desktop notifications are disabled. [releases]: https://github.com/osa1/tiny/releases diff --git a/rust-toolchain b/rust-toolchain index bf867e0a..2bf5ad04 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly +stable