ci(gt): update

Author: vyloy

.cargo/config.toml

@@ -0,0 +1,11 @@
+[target.x86_64-unknown-linux-gnu]
+linker = "x86_64-linux-gnu-gcc"
+rustflags = ["-C", "target-feature=+crt-static"]
+
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+rustflags = ["-C", "target-feature=+crt-static"]
+
+[target.riscv64gc-unknown-linux-gnu]
+linker = "riscv64-linux-gnu-gcc"
+rustflags = ["-C", "target-feature=+crt-static"]

.github/workflows/container.yml

@@ -42,12 +42,12 @@ jobs:
       run: |-
         sudo apt-get update && sudo apt-get install make git gn ninja-build python3 python3-pip libgtk-3-dev gcc-aarch64-linux-gnu g++-aarch64-linux-gnu gcc-x86-64-linux-gnu g++-x86-64-linux-gnu gcc-riscv64-linux-gnu g++-riscv64-linux-gnu rustc upx -y
         rustup target add x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu riscv64gc-unknown-linux-gnu
-        make release
+        make linux
         mkdir -p release
         cp target/x86_64-unknown-linux-gnu/release/gt release/linux-x86_64-gt
         cp target/aarch64-unknown-linux-gnu/release/gt release/linux-aarch64-gt
-        cp target/riscv64gc-unknown-linux-gnu/release/gt release/linux-riscv64-gt
         upx release/*
+        cp target/riscv64gc-unknown-linux-gnu/release/gt release/linux-riscv64-gt
 
     - name: Archive GT artifacts
       uses: actions/upload-artifact@v3

.gitignore

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-/cs/build
-/cs/release
-/cs/dep/_msquic/out
-/cs/dep/_google-webrtc/src/out
+/libcs/build
+/libcs/release
+/libcs/dep/_msquic/out
+/libcs/dep/_google-webrtc/src/out
 /target/
 .dockerignore
 .DS_Store

bin/Cargo.lock renamed to Cargo.lock

@@ -0,0 +1,14 @@
+[workspace]
+members = ["bin"]
+resolver = "2"
+
+[workspace.package]
+authors = ["Zhiyi Weng"]
+version = "2.1.6"
+edition = "2021"
+description = "Fast WebSocket(s)/HTTP(s)/TCP relay proxy with WebRTC P2P supports."
+
+[patch.crates-io]
+webrtc = { git = "https://github.com/vyloy/webrtc.git", branch = "master" }
+rcgen = { git = "https://github.com/vyloy/rcgen.git", branch = "main" }
+x509-parser = { git = "https://github.com/vyloy/x509-parser.git", branch = "master" }

Cargo.toml

@@ -23,6 +23,6 @@ ENV TZ=Asia/Shanghai
 RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Asia/Shanghai apt-get -y install tzdata ca-certificates && rm -rf /var/lib/apt/lists/*
 
 COPY release/* /
-RUN cp /linux-`arch`-gt /usr/bin/gt && rm -f /*-gt
+RUN cp /linux-`arch`-gt /usr/bin/gt && ln -s /usr/bin/gt /usr/bin/client && rm -f /*-gt
 
-ENTRYPOINT ["/usr/bin/gt", "manager", "-c", "/opt/config/aonetwork-client.yml"]
+ENTRYPOINT ["/usr/bin/gt", "client", "-c", "/opt/config/aonetwork-client.yml"]