Skip to content

Commit

Permalink
ready for publishing v1.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zonyitoo committed Feb 22, 2021
1 parent 0f81561 commit b3de247
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 54 deletions.
123 changes: 71 additions & 52 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@
![Build Releases](https://github.com/shadowsocks/shadowsocks-rust/workflows/Build%20Releases/badge.svg)
[![License](https://img.shields.io/github/license/zonyitoo/shadowsocks-rust.svg)](https://github.com/zonyitoo/shadowsocks-rust)
[![crates.io](https://img.shields.io/crates/v/shadowsocks-rust.svg)](https://crates.io/crates/shadowsocks-rust)
[![docs.rs](https://img.shields.io/docsrs/shadowsocks-rust)](https://docs.rs/shadowsocks-rust)
[![Release](https://img.shields.io/github/release/shadowsocks/shadowsocks-rust.svg)](https://github.com/shadowsocks/shadowsocks-rust/releases)
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=shadowsocks%2fshadowsocks-rust)](https://dependabot.com)

This is a port of [shadowsocks](https://github.com/shadowsocks/shadowsocks).

shadowsocks is a fast tunnel proxy that helps you bypass firewalls.

| Library | Description |
| ------- | ----------- |
| **shadowsocks** | [![crates.io](https://img.shields.io/crates/v/shadowsocks.svg)](https://crates.io/crates/shadowsocks) [![docs.rs](https://img.shields.io/docsrs/shadowsocks)](https://docs.rs/shadowsocks) shadowsocks core protocol |
| **shadowsocks-service** | [![crates.io](https://img.shields.io/crates/v/shadowsocks-service.svg)](https://crates.io/crates/shadowsocks-service) [![docs.rs](https://img.shields.io/docsrs/shadowsocks-service)](https://docs.rs/shadowsocks-service) Services for serving shadowsocks |
| **shadowsocks-rust** | [![crates.io](https://img.shields.io/crates/v/shadowsocks-rust.svg)](https://crates.io/crates/shadowsocks-rust) [![docs.rs](https://img.shields.io/docsrs/shadowsocks-rust)](https://docs.rs/shadowsocks-rust) Binaries running common shadowsocks services |

## Build & Install

### Optional Features
Expand Down Expand Up @@ -71,7 +78,7 @@ Then `sslocal` and `ssserver` will appear in `./target/(debug|release)/`, it wor
make install TARGET=release
```

Then `sslocal`, `ssserver`, `sstunnel` and `ssurl` will be installed in `/usr/local/bin` (variable PREFIX).
Then `sslocal`, `ssserver`, `ssmanager` and `ssurl` will be installed to `/usr/local/bin` (variable PREFIX).

For Windows users, if you have encountered any problem in building, check and discuss in [#102](https://github.com/shadowsocks/shadowsocks-rust/issues/102).

Expand Down
23 changes: 23 additions & 0 deletions cargo-publish.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash -e

set -x

ROOT_DIR=$(dirname $0)
cd ${ROOT_DIR:?}

package_ordered="crates/shadowsocks crates/shadowsocks-service ."

## dry-run
cargo check

for p in ${package_ordered:?}; do
cargo update -p shadowsocks
cargo update -p shadowsocks-service
echo "====> dry-run publish $p"
cargo publish --verbose --locked --dry-run --manifest-path "${p:?}/Cargo.toml"
echo "====> publishing $p"
cargo publish --verbose --locked --manifest-path "${p:?}/Cargo.toml"

# this seems to be enough time to let crates.io update
sleep 10
done
4 changes: 4 additions & 0 deletions crates/shadowsocks-service/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# shadowsocks-service

[![License](https://img.shields.io/github/license/zonyitoo/shadowsocks-rust.svg)](https://github.com/zonyitoo/shadowsocks-rust)
[![crates.io](https://img.shields.io/crates/v/shadowsocks-service.svg)](https://crates.io/crates/shadowsocks-service)
[![docs.rs](https://img.shields.io/docsrs/shadowsocks-service)](https://docs.rs/shadowsocks-service)

This is a port of [shadowsocks](https://github.com/shadowsocks/shadowsocks).

shadowsocks is a fast tunnel proxy that helps you bypass firewalls.
Expand Down
2 changes: 1 addition & 1 deletion crates/shadowsocks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ async-trait = "0.1"

mio = "0.7"
socket2 = "0.3"
tokio = { version = "1.2", features = ["io-util", "macros", "net", "parking_lot", "process", "rt"] }
tokio = { version = "1.2", features = ["io-util", "macros", "net", "parking_lot", "process", "rt", "sync"] }

trust-dns-resolver = { version = "0.20", optional = true }
arc-swap = { version = "1.2", optional = true }
Expand Down
4 changes: 4 additions & 0 deletions crates/shadowsocks/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# shadowsocks

[![License](https://img.shields.io/github/license/zonyitoo/shadowsocks-rust.svg)](https://github.com/zonyitoo/shadowsocks-rust)
[![crates.io](https://img.shields.io/crates/v/shadowsocks.svg)](https://crates.io/crates/shadowsocks)
[![docs.rs](https://img.shields.io/docsrs/shadowsocks)](https://docs.rs/shadowsocks)

This is a port of [shadowsocks](https://github.com/shadowsocks/shadowsocks).

shadowsocks is a fast tunnel proxy that helps you bypass firewalls.

0 comments on commit b3de247

Please sign in to comment.