From 33121bc0a36769cc2d0d6a6ce2720438cbda051e Mon Sep 17 00:00:00 2001 From: Antoine Gersant Date: Mon, 7 Dec 2020 22:08:37 -0800 Subject: [PATCH] Pin rust toolchain version (#108) --- .github/workflows/build.yml | 2 -- .github/workflows/coverage.yml | 2 -- .github/workflows/release.yml | 2 -- .github/workflows/validate-install.yml | 6 ------ docs/CONTRIBUTING.md | 2 +- docs/SETUP.md | 2 +- rust-toolchain | 1 + 7 files changed, 3 insertions(+), 14 deletions(-) create mode 100644 rust-toolchain diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b82533..4925ee1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,9 +20,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly profile: minimal - default: true - uses: actions-rs/cargo@v1 with: command: test diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 39b3ea8..08aadcd 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -20,9 +20,7 @@ jobs: uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly profile: minimal - default: true - name: Install Tarpaulin run: cargo install cargo-tarpaulin - name: Run Tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86c9867..d79764c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,9 +46,7 @@ jobs: - name: Install Rust Toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly profile: minimal - default: true - name: Make release uses: ./.github/actions/make-windows-release with: diff --git a/.github/workflows/validate-install.yml b/.github/workflows/validate-install.yml index d7f01c1..3175e25 100644 --- a/.github/workflows/validate-install.yml +++ b/.github/workflows/validate-install.yml @@ -47,9 +47,7 @@ jobs: run: make preview PREFIX=/some/random/prefix - uses: actions-rs/toolchain@v1 with: - toolchain: nightly profile: minimal - default: true - name: Install run: sudo --preserve-env=PATH make install - name: Run Polaris @@ -80,9 +78,7 @@ jobs: run: make preview-xdg XDG_DATA_HOME=/my/own/xdg/home - uses: actions-rs/toolchain@v1 with: - toolchain: nightly profile: minimal - default: true - name: Install run: make install-xdg - name: Run Polaris @@ -104,9 +100,7 @@ jobs: - name: Install Rust Toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly profile: minimal - default: true - name: Make release uses: ./.github/actions/make-windows-release with: diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 08a1b8d..306a2bf 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -4,7 +4,7 @@ Compiling and running Polaris is very easy as it only depends on the Rust toolchain. -1. [Install Rust](https://www.rust-lang.org/en-US/install.html), you need the `nightly` version of the toolchain +1. [Install Rust](https://www.rust-lang.org/en-US/install.html) 2. Clone the polaris depot with this command: `git clone --recursive https://github.com/agersant/polaris.git` 3. You can now run compile and run polaris from the newly created directory with the command: `cargo run` diff --git a/docs/SETUP.md b/docs/SETUP.md index ae76a32..9ba5d69 100644 --- a/docs/SETUP.md +++ b/docs/SETUP.md @@ -18,7 +18,7 @@ You can now start Polaris from the start menu or from your desktop, Polaris will #### Dependencies 1. Install OpenSSL, SQLite and their headers, and some development tools. These are available from your distribution's package manager. For instance on Ubuntu, execute `sudo apt-get install binutils pkg-config libssl-dev libsqlite3-dev` -2. Install the nightly Rust compiler by executing `curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly` or using an [alternative method](https://www.rust-lang.org/en-US/install.html) +2. Install the Rust compiler by executing `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh` or using an [alternative method](https://www.rust-lang.org/en-US/install.html) #### Polaris installation 1. Download the [latest release]((https://github.com/agersant/polaris/releases/latest)) of Polaris (you want the .tar.gz file) diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 0000000..2f9ebd3 --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +nightly-2020-12-08 \ No newline at end of file