Skip to content

Commit 78e0e0e

Browse files
committed
Build with stable Rust.
- #750 introduced strip=true, but it can only be used in >= 1.59
1 parent 15ff6ac commit 78e0e0e

File tree

6 files changed

+13
-18
lines changed

6 files changed

+13
-18
lines changed

.github/workflows/build-and-test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ jobs:
2929
~/.cargo/git
3030
target
3131
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
32-
- name: Install Rust nightly
32+
- name: Install Rust
3333
uses: actions-rs/toolchain@v1
3434
with:
35+
toolchain: stable
3536
profile: minimal
3637
components: clippy
3738
- name: Build & Test (Default)
@@ -64,6 +65,7 @@ jobs:
6465
uses: actions-rs/toolchain@v1
6566
with:
6667
target: aarch64-apple-darwin
68+
toolchain: stable
6769
if: runner.os == 'macOS'
6870

6971
# https://github.com/actions/virtual-environments/issues/2557#issuecomment-769611326

.github/workflows/build-nightly-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ jobs:
6969
# echo "::add-path::/usr/local/opt/gnu-tar/libexec/gnubin"
7070
echo "/usr/local/opt/gnu-tar/libexec/gnubin" >> $GITHUB_PATH
7171
72-
- name: Install Rust nightly
72+
- name: Install Rust
7373
uses: actions-rs/toolchain@v1
7474
with:
7575
profile: minimal
76-
toolchain: nightly
7776
target: ${{ matrix.target }}
77+
toolchain: stable
7878
default: true
7979
override: true
8080

@@ -103,11 +103,11 @@ jobs:
103103
steps:
104104
- uses: actions/checkout@v2
105105

106-
- name: Install Rust nightly
106+
- name: Install Rust
107107
uses: actions-rs/toolchain@v1
108108
with:
109109
profile: minimal
110-
toolchain: nightly
110+
toolchain: stable
111111
default: true
112112
override: true
113113

.github/workflows/build-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ jobs:
8484
# echo "::add-path::/usr/local/opt/gnu-tar/libexec/gnubin"
8585
echo "/usr/local/opt/gnu-tar/libexec/gnubin" >> $GITHUB_PATH
8686
87-
- name: Install Rust Nightly
87+
- name: Install Rust
8888
uses: actions-rs/toolchain@v1
8989
with:
9090
profile: minimal
91-
toolchain: nightly
9291
target: ${{ matrix.target }}
92+
toolchain: stable
9393
default: true
9494
override: true
9595

@@ -120,11 +120,11 @@ jobs:
120120
steps:
121121
- uses: actions/checkout@v2
122122

123-
- name: Install Rust Nightly
123+
- name: Install Rust
124124
uses: actions-rs/toolchain@v1
125125
with:
126126
profile: minimal
127-
toolchain: nightly
127+
toolchain: stable
128128
default: true
129129
override: true
130130

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ lto = "fat"
5050
codegen-units = 1
5151
incremental = false
5252
panic = "abort"
53-
strip = true
53+
#strip = true
5454

5555
[features]
5656
default = [

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ This project uses system (libc) memory allocator (Rust's default). But it also a
6969
Install from [crates.io](https://crates.io/crates/shadowsocks-rust):
7070

7171
```bash
72-
# Set default toolchain to nightly
73-
rustup default nightly
74-
# RECOMMEND: Check the rust-toolchain file in the project root and use the recommended nightly version
75-
# For example:
76-
# rustup default nightly-2021-06-03
77-
7872
# Install from crates.io
7973
cargo install shadowsocks-rust
8074
```
@@ -789,7 +783,7 @@ It supports the following features:
789783
- [x] Improved logging format (waiting for the new official log crate)
790784
- [x] Support more ciphers without depending on `libcrypto` (waiting for an acceptable Rust crypto lib implementation)
791785
- [x] Windows support.
792-
- [ ] Build with stable `rustc` (blocking by `crypto2`).
786+
- [x] Build with stable `rustc` <del>(blocking by `crypto2`)</del>.
793787
- [x] Support HTTP Proxy protocol
794788
- [x] AEAD ciphers. (proposed in [SIP004](https://github.com/shadowsocks/shadowsocks-org/issues/30), still under discussion)
795789
- [x] Choose server based on delay #152

rust-toolchain

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)