ci(gt): update

ao-space · Feb 1, 2024 · 04bf863 · 04bf863
1 parent 2d55483
commit 04bf863
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -42,7 +42,7 @@ 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

diff --git a/Dockerfile-client b/Dockerfile-client
@@ -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"]
diff --git a/Makefile b/Makefile
@@ -1,12 +1,12 @@
-linux-release:
+linux:
 	cd ./cs && TARGET=aarch64-linux-gnu GOOS=linux GOARCH=arm64 make release_lib
 	cargo build --target aarch64-unknown-linux-gnu -r
 	cd ./cs && TARGET=x86_64-linux-gnu GOOS=linux GOARCH=amd64 make release_lib
 	cargo build --target x86_64-unknown-linux-gnu -r
 	cd ./cs && TARGET=riscv64-linux-gnu GOOS=linux GOARCH=riscv64 make release_lib
 	cargo build --target riscv64gc-unknown-linux-gnu -r
 
-mac-release:
+mac:
 	cd ./cs &&  TARGET=aarch64-apple-darwin GOOS=darwin GOARCH=arm64 arch -arch arm64 make release_lib
 	cargo build --target aarch64-apple-darwin -r
 	cd ./cs && TARGET=x86_64-apple-darwin GOOS=darwin GOARCH=amd64 arch -arch x86_64 make release_lib

diff --git a/entrypoint-server.sh b/entrypoint-server.sh
@@ -31,4 +31,4 @@ options:
   reconnectTimes: ${NETWORK_RECONNECTTIMES:-3}
 EOF
 
-exec /usr/bin/gt manager -c /opt/aonetwork-server.yml
+exec /usr/bin/gt server -c /opt/aonetwork-server.yml