Skip to content

Commit

Permalink
Switch to stable toolchain
Browse files Browse the repository at this point in the history
Fixes #241
  • Loading branch information
osa1 committed Oct 8, 2020
1 parent c828a01 commit b08342e
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly
stable

1 comment on commit b08342e

@trevarj
Copy link
Contributor

@trevarj trevarj commented on b08342e Oct 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

Please sign in to comment.