From 89903a9cc589e076dc629a19d5a567a2f5dee68c Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 09:28:21 +0800
Subject: [PATCH 01/41] fix cicd step 1

---
 .github/workflows/client_build.yml | 2 +-
 .github/workflows/server_build.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 1a98286..58e8a3e 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -35,7 +35,7 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          file: command/client/client.Dockerfile
+          file: command/docker/client/client.Dockerfile
           cache-from: type=gha
           cache-to: type=gha,mode=max
           tags: fornetcode/fornet:${{github.event.inputs.version}}
diff --git a/.github/workflows/server_build.yml b/.github/workflows/server_build.yml
index 7500493..014bb78 100644
--- a/.github/workflows/server_build.yml
+++ b/.github/workflows/server_build.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: lts
+          node-version: 18
           cache: 'npm'        
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

From fb1ce2a28d1a35b102e80cc89533c0ccd0e90b93 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 13:32:04 +0800
Subject: [PATCH 02/41] fix cicd step2

---
 .github/workflows/server_build.yml      |  3 ++-
 README.md                               |  2 +-
 command/docker/client/client.Dockerfile | 10 +++++-----
 command/docker/client/script.sh         | 15 +++++++++++++++
 4 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 command/docker/client/script.sh

diff --git a/.github/workflows/server_build.yml b/.github/workflows/server_build.yml
index 014bb78..8e2c128 100644
--- a/.github/workflows/server_build.yml
+++ b/.github/workflows/server_build.yml
@@ -26,7 +26,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: 'npm'        
+          cache: 'npm'
+          cache-dependency-path: 'admin-web/package-lock.json'
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       -
diff --git a/README.md b/README.md
index 5a7799e..dd770ac 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ ForNet is another Layer3 Virutal Private Network software, built on top of [Bori
 currently, it's in `beta` stage, supports macOS and Linux， Windows is in blocked for tun driver sign.
 
 ## Document
-To check out docs, visit [git page](https://fornetcode.github.io). There's also a [Roadmap](https://fornetcode.github.io/plan) to show you where the project go.
+To check out docs, visit [git page](https://fornetcode.github.io/documentation). There's also a [Roadmap](https://fornetcode.github.io/documentation/plan) to show you where the project go.
 
 
 ## License
diff --git a/command/docker/client/client.Dockerfile b/command/docker/client/client.Dockerfile
index 9559946..97601f2 100644
--- a/command/docker/client/client.Dockerfile
+++ b/command/docker/client/client.Dockerfile
@@ -11,18 +11,18 @@ ARG RUNTIME_IMAGE=rust:1.65
 
 FROM ${BASE_IMAGE} AS builder
 
+RUN apt update && apt install -y cmake bash
+
 
-RUN mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-$(uname -m).zip && unzip protoc-21.9-linux-$(uname -m).zip && cp bin/* /usr/bin/
 #RUN  apt update &&  apt upgrade -y &&  apt install -y protobuf-compiler libprotobuf-dev
-RUN apt update && apt install -y cmake
+
 # Add our source code.
 ADD protobuf /source/protobuf
-RUN cp -r /protoc/include/* /source/protobuf/
 ADD third /source/third
 ADD client /source/client
-# This is for windows, But must be in for cargo.
 ADD win-tun-driver /source/win-tun-driver
-
+ADD command/docker/client/script.sh /script.sh
+RUN /script.sh
 #RUN ls -al && cd protobuf && ls -al && cd ../
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
      cd /source/client && cargo build --release
diff --git a/command/docker/client/script.sh b/command/docker/client/script.sh
new file mode 100644
index 0000000..33ebc0a
--- /dev/null
+++ b/command/docker/client/script.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# this runs in Docker to build 
+
+mkdir /protoc && cd /protoc
+
+architecture=$(uname -m)
+if [ $architecture=='aarch64' ];
+then
+    architecture='aarch_64'
+fi
+
+wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-$architecture.zip && unzip protoc-21.9-linux-$architecture.zip && cp bin/* /usr/bin/
+
+cp -r /protoc/include/* /source/protobuf/
\ No newline at end of file

From f0b8b707a15ac13e9f0527b609018145f3b204c6 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 15:23:26 +0800
Subject: [PATCH 03/41] fix cicd, step 3

---
 admin-web/.env                                       | 2 ++
 command/docker/client/client.Dockerfile.dockerignore | 1 +
 2 files changed, 3 insertions(+)

diff --git a/admin-web/.env b/admin-web/.env
index 7f0e4f6..31e00fa 100644
--- a/admin-web/.env
+++ b/admin-web/.env
@@ -1,3 +1,5 @@
 BROWSER=none
 REACT_APP_BASE_API="/api"
+# github action would fail when warning occur, just ignore now
+CI=false
 # FAST_REFRESH=false # trigger this to force refresh less config. 来回改它可强制刷新样式配置
diff --git a/command/docker/client/client.Dockerfile.dockerignore b/command/docker/client/client.Dockerfile.dockerignore
index ee06473..73d9ef5 100644
--- a/command/docker/client/client.Dockerfile.dockerignore
+++ b/command/docker/client/client.Dockerfile.dockerignore
@@ -6,6 +6,7 @@
 /app
 /backend
 /command
+!/command/docker/client
 /docs
 /java_backend
 /node_modules

From bbadf204014679ffc09fd54f88764b11ecb1db68 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 16:06:34 +0800
Subject: [PATCH 04/41] fix cicd, step 4

---
 admin-web/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-web/.env b/admin-web/.env
index 31e00fa..228d327 100644
--- a/admin-web/.env
+++ b/admin-web/.env
@@ -1,5 +1,5 @@
 BROWSER=none
 REACT_APP_BASE_API="/api"
 # github action would fail when warning occur, just ignore now
-CI=false
+REACT_CI=false
 # FAST_REFRESH=false # trigger this to force refresh less config. 来回改它可强制刷新样式配置

From ddb0071b949f06365d57b52f9eed2b644e136914 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 16:22:58 +0800
Subject: [PATCH 05/41] fix cicd, step 5

---
 admin-web/.env                             | 3 +--
 admin-web/src/view/node/CreateNodePage.tsx | 2 +-
 admin-web/src/view/node/NodeDetailPage.tsx | 3 ++-
 command/docker/client/client.Dockerfile    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin-web/.env b/admin-web/.env
index 228d327..b9a5642 100644
--- a/admin-web/.env
+++ b/admin-web/.env
@@ -1,5 +1,4 @@
 BROWSER=none
 REACT_APP_BASE_API="/api"
-# github action would fail when warning occur, just ignore now
-REACT_CI=false
+
 # FAST_REFRESH=false # trigger this to force refresh less config. 来回改它可强制刷新样式配置
diff --git a/admin-web/src/view/node/CreateNodePage.tsx b/admin-web/src/view/node/CreateNodePage.tsx
index bf1e8a7..67452b1 100644
--- a/admin-web/src/view/node/CreateNodePage.tsx
+++ b/admin-web/src/view/node/CreateNodePage.tsx
@@ -11,7 +11,7 @@ export function CreateNodePage() {
     let {networkId} = useParams<{ networkId: string }>()
     const [network, setNetwork] = useState<Network>()
     const [form] = Form.useForm<CreateNode>()
-    const nodeType = Form.useWatch('nodeType', form);
+    Form.useWatch('nodeType', form);
     const navi = useNavigate()
     const intl = useIntl()
     useEffect(() => {
diff --git a/admin-web/src/view/node/NodeDetailPage.tsx b/admin-web/src/view/node/NodeDetailPage.tsx
index 111950d..ee09a63 100644
--- a/admin-web/src/view/node/NodeDetailPage.tsx
+++ b/admin-web/src/view/node/NodeDetailPage.tsx
@@ -1,5 +1,5 @@
 import {useParams} from "react-router-dom";
-import {Button, Form, Input, InputNumber, message, Row, Col, Space} from "antd";
+import {Button, Form, Input, InputNumber, message, Row, Col} from "antd";
 import {useIntl} from "react-intl";
 import {getNode, NodeType, Node, updateNode} from "../../api/nodeAPI";
 import {enumToDesc} from "../../local/intl";
@@ -78,6 +78,7 @@ export default function NodeDetailPage() {
             })
 
         }
+        // eslint-disable-next-line
     }, [networkId, nodeId])
     if (!network) {
         return <></>
diff --git a/command/docker/client/client.Dockerfile b/command/docker/client/client.Dockerfile
index 97601f2..8cc56de 100644
--- a/command/docker/client/client.Dockerfile
+++ b/command/docker/client/client.Dockerfile
@@ -22,7 +22,7 @@ ADD third /source/third
 ADD client /source/client
 ADD win-tun-driver /source/win-tun-driver
 ADD command/docker/client/script.sh /script.sh
-RUN /script.sh
+RUN chmod +x /script.sh && /script.sh
 #RUN ls -al && cd protobuf && ls -al && cd ../
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
      cd /source/client && cargo build --release

From 152f19b205e4af8823ca6c1e605e2af8412f060d Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 16:46:58 +0800
Subject: [PATCH 06/41] fix cicd, step 6

---
 Makefile                                | 8 ++++----
 command/docker/client/client.Dockerfile | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7688c0c..25f6192 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ release-linux:
 	tar -C ./target/release/ -czvf ../release/fornet-linux-$(uname -m).tar.gz ./fornet ./fornet-cli
 
 release-backend:
-	cd admin-web && npm ci && npm run build:prod
-	cp -r /build/ ../command/docker/backend/web
-	cd ../backend && sbt universal:packageBin
-	cp ./target/universal/app-*.zip ../command/docker/backend/app.zip && cd ../command/docker/backend && unzip app.zip && rm app.zip && mv app-* app
\ No newline at end of file
+	cd admin-web && npm ci && npm run build:prod && cd ../
+	cp -r admin-web/build/ command/docker/backend/web
+	cd backend && sbt universal:packageBin && cd ../
+	cp ./target/universal/app-*.zip command/docker/backend/app.zip && cd command/docker/backend && unzip app.zip && rm app.zip && mv app-* app
\ No newline at end of file
diff --git a/command/docker/client/client.Dockerfile b/command/docker/client/client.Dockerfile
index 8cc56de..202746b 100644
--- a/command/docker/client/client.Dockerfile
+++ b/command/docker/client/client.Dockerfile
@@ -11,7 +11,7 @@ ARG RUNTIME_IMAGE=rust:1.65
 
 FROM ${BASE_IMAGE} AS builder
 
-RUN apt update && apt install -y cmake bash
+RUN apt update && apt install -y cmake bash git
 
 
 #RUN  apt update &&  apt upgrade -y &&  apt install -y protobuf-compiler libprotobuf-dev

From 26a629de8f920f210f879b5058fe0eddb05f654f Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 19:05:07 +0800
Subject: [PATCH 07/41] fix cicd, step 7

---
 Makefile                                | 2 +-
 command/docker/client/client.Dockerfile | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 25f6192..3d4ca30 100644
--- a/Makefile
+++ b/Makefile
@@ -42,4 +42,4 @@ release-backend:
 	cd admin-web && npm ci && npm run build:prod && cd ../
 	cp -r admin-web/build/ command/docker/backend/web
 	cd backend && sbt universal:packageBin && cd ../
-	cp ./target/universal/app-*.zip command/docker/backend/app.zip && cd command/docker/backend && unzip app.zip && rm app.zip && mv app-* app
\ No newline at end of file
+	cp backend/target/universal/app-*.zip command/docker/backend/app.zip && cd command/docker/backend && unzip app.zip && rm app.zip && mv app-* app
\ No newline at end of file
diff --git a/command/docker/client/client.Dockerfile b/command/docker/client/client.Dockerfile
index 202746b..80d4b67 100644
--- a/command/docker/client/client.Dockerfile
+++ b/command/docker/client/client.Dockerfile
@@ -24,8 +24,9 @@ ADD win-tun-driver /source/win-tun-driver
 ADD command/docker/client/script.sh /script.sh
 RUN chmod +x /script.sh && /script.sh
 #RUN ls -al && cd protobuf && ls -al && cd ../
+RUN cd /source/client
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
-     cd /source/client && cargo build --release
+     cargo build --release
 
 FROM ${RUNTIME_IMAGE}
 

From b8496a1aded9eb728758886fd6c570afc92e51ae Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 19:23:45 +0800
Subject: [PATCH 08/41] fix cicd, step 8

---
 .github/workflows/client_build.yml      | 4 ++++
 .github/workflows/server_build.yml      | 2 +-
 command/docker/client/client.Dockerfile | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 58e8a3e..f7375b7 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -18,6 +18,10 @@ jobs:
         with:
           submodules: true
           ref: ${{ github.event.inputs.branch }}
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
diff --git a/.github/workflows/server_build.yml b/.github/workflows/server_build.yml
index 8e2c128..75aba65 100644
--- a/.github/workflows/server_build.yml
+++ b/.github/workflows/server_build.yml
@@ -43,7 +43,7 @@ jobs:
         name: build and push docker image
         uses: docker/build-push-action@v2
         with:
-          context: command/backend        
+          context: command/docker/backend        
             #platforms: linux/amd64,linux/arm64
           push: true        
           cache-from: type=gha
diff --git a/command/docker/client/client.Dockerfile b/command/docker/client/client.Dockerfile
index 80d4b67..4885772 100644
--- a/command/docker/client/client.Dockerfile
+++ b/command/docker/client/client.Dockerfile
@@ -24,9 +24,9 @@ ADD win-tun-driver /source/win-tun-driver
 ADD command/docker/client/script.sh /script.sh
 RUN chmod +x /script.sh && /script.sh
 #RUN ls -al && cd protobuf && ls -al && cd ../
-RUN cd /source/client
+
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
-     cargo build --release
+    cd /source/client && cargo build --release
 
 FROM ${RUNTIME_IMAGE}
 

From be5ffc443e06c0120d2d670948d132738e591e12 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 22:43:09 +0800
Subject: [PATCH 09/41] fix cicd, step 9

---
 .github/workflows/client_build.yml      | 2 +-
 .github/workflows/server_build.yml      | 2 +-
 command/docker/client/client.Dockerfile | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index f7375b7..4f8cf37 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -42,7 +42,7 @@ jobs:
           file: command/docker/client/client.Dockerfile
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: fornetcode/fornet:${{github.event.inputs.version}}
+          tags: ${{ env.REGISTRY }}/fornetcode/fornet:${{github.event.inputs.version}}
   commandLine:
     strategy:
       matrix:
diff --git a/.github/workflows/server_build.yml b/.github/workflows/server_build.yml
index 75aba65..f0253cf 100644
--- a/.github/workflows/server_build.yml
+++ b/.github/workflows/server_build.yml
@@ -48,4 +48,4 @@ jobs:
           push: true        
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: fornetcode/fornet-backend:${{github.event.inputs.version}}
+          tags: ${{ env.REGISTRY }}/fornetcode/fornet-backend:${{github.event.inputs.version}}
diff --git a/command/docker/client/client.Dockerfile b/command/docker/client/client.Dockerfile
index 4885772..c4c0157 100644
--- a/command/docker/client/client.Dockerfile
+++ b/command/docker/client/client.Dockerfile
@@ -9,9 +9,9 @@ ARG BASE_IMAGE=rust:1.65
 #ARG RUNTIME_IMAGE=alpine
 ARG RUNTIME_IMAGE=rust:1.65
 
-FROM ${BASE_IMAGE} AS builder
+FROM --platform=$BUILDPLATFORM ${BASE_IMAGE} AS builder
 
-RUN apt update && apt install -y cmake bash git
+RUN apt update && apt install -y cmake bash
 
 
 #RUN  apt update &&  apt upgrade -y &&  apt install -y protobuf-compiler libprotobuf-dev
@@ -28,7 +28,7 @@ RUN chmod +x /script.sh && /script.sh
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
     cd /source/client && cargo build --release
 
-FROM ${RUNTIME_IMAGE}
+FROM --platform=$BUILDPLATFORM  ${RUNTIME_IMAGE}
 
 ENV FORNET_CONFIG=/config
 

From 30b21e1d2fa6223c3a86c81d4b3f682cf3ffaf21 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 23:13:29 +0800
Subject: [PATCH 10/41] fix cicd, step 10

---
 .github/workflows/client_build.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 4f8cf37..751b02c 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -17,11 +17,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-          ref: ${{ github.event.inputs.branch }}
-      
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      
+          ref: ${{ github.event.inputs.branch }}      
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -37,7 +33,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          #platforms: linux/amd64,linux/arm64
           push: true
           file: command/docker/client/client.Dockerfile
           cache-from: type=gha

From e75a7d6690c11fd0fc14d916593fac5aef867a1c Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 23:39:14 +0800
Subject: [PATCH 11/41] fix cicd, step 11

---
 command/docker/client/script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/command/docker/client/script.sh b/command/docker/client/script.sh
index 33ebc0a..adba83d 100644
--- a/command/docker/client/script.sh
+++ b/command/docker/client/script.sh
@@ -5,7 +5,7 @@
 mkdir /protoc && cd /protoc
 
 architecture=$(uname -m)
-if [ $architecture=='aarch64' ];
+if [ $architecture == aarch64 ];
 then
     architecture='aarch_64'
 fi

From 5fbfaaba385df562c4124d31a988656bc7988477 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 23:51:01 +0800
Subject: [PATCH 12/41] fix cicd, step 12

---
 .github/workflows/client_build.yml | 58 +++++++++++++++---------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 751b02c..ab92235 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -11,34 +11,34 @@ on:
 env:
   REGISTRY: ghcr.io
 jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-          ref: ${{ github.event.inputs.branch }}      
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      -
-        name: Login to GithubPackages
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: build and push docker image
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          #platforms: linux/amd64,linux/arm64
-          push: true
-          file: command/docker/client/client.Dockerfile
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ${{ env.REGISTRY }}/fornetcode/fornet:${{github.event.inputs.version}}
+  # docker:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #       with:
+  #         submodules: true
+  #         ref: ${{ github.event.inputs.branch }}      
+  #     -
+  #       name: Set up Docker Buildx
+  #       uses: docker/setup-buildx-action@v2
+  #     -
+  #       name: Login to GithubPackages
+  #       uses: docker/login-action@v2
+  #       with:
+  #         registry: ${{ env.REGISTRY }}
+  #         username: ${{ github.actor }}
+  #         password: ${{ secrets.GITHUB_TOKEN }}
+  #     -
+  #       name: build and push docker image
+  #       uses: docker/build-push-action@v2
+  #       with:
+  #         context: .
+  #         #platforms: linux/amd64,linux/arm64
+  #         push: true
+  #         file: command/docker/client/client.Dockerfile
+  #         cache-from: type=gha
+  #         cache-to: type=gha,mode=max
+  #         tags: ${{ env.REGISTRY }}/fornetcode/fornet:${{github.event.inputs.version}}
   commandLine:
     strategy:
       matrix:
@@ -52,7 +52,7 @@ jobs:
           - host: macos-latest
             target: x86_64-apple-darwin
             build: make release-mac-x86_64
-    runs-on: ${{ matrix.settings.os }}
+    runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v3
         with:

From a6da240fe36e1cef2c2c75ef0fb647703696fc31 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Fri, 12 May 2023 23:52:56 +0800
Subject: [PATCH 13/41] fix cicd, step 13

---
 .github/workflows/client_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index ab92235..fbbd6b6 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -58,7 +58,7 @@ jobs:
         with:
           submodules: true
       - name: Install Rust
-        uses: actions-rs/toolchain@v2
+        uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
       - name: Cache cargo registry

From 803d14f094eaa4d9a9559cd4a420d456008ca848 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 00:00:59 +0800
Subject: [PATCH 14/41] fix cicd, step 14

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3d4ca30..6cc0d27 100644
--- a/Makefile
+++ b/Makefile
@@ -28,15 +28,15 @@ release-mac-aarch_64:
 	tar -C ./target/release/ -czvf ../release/fornet-mac-aarch_64.tar.gz ./fornet ./fornet-cli
 	ls -lisah ../release/fornet-mac-aarch_64.tar.gz
 
-release-linux:
-	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-$(uname -m).zip && unzip protoc-21.9-linux-$(uname -m).zip && cp bin/* /usr/bin/
+release-linux:	
+	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cp bin/* /usr/bin/
 	apt-get install -y build-essential libssl-dev cmake
 	mkdir -p release
 	cd client
 	cargo build --release
 	strip target/release/fornet
 	strip target/release/fornet-cli
-	tar -C ./target/release/ -czvf ../release/fornet-linux-$(uname -m).tar.gz ./fornet ./fornet-cli
+	tar -C ./target/release/ -czvf ../release/fornet-linux-x86_64.tar.gz ./fornet ./fornet-cli
 
 release-backend:
 	cd admin-web && npm ci && npm run build:prod && cd ../

From 541686b946adf4c7bd1e8f07b983c9a18303fe2b Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 00:02:52 +0800
Subject: [PATCH 15/41] fix cicd, step 15

---
 .github/workflows/client_build.yml | 10 +++-------
 .github/workflows/server_build.yml |  5 -----
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index fbbd6b6..d6bc39e 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -5,9 +5,6 @@ on:
       version:
         required: true
         description: "version to release"
-      branch:
-        default: main
-        description: "git branch"
 env:
   REGISTRY: ghcr.io
 jobs:
@@ -17,7 +14,6 @@ jobs:
   #     - uses: actions/checkout@v3
   #       with:
   #         submodules: true
-  #         ref: ${{ github.event.inputs.branch }}      
   #     -
   #       name: Set up Docker Buildx
   #       uses: docker/setup-buildx-action@v2
@@ -45,13 +41,13 @@ jobs:
         settings:
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            build: make release-linux
+            build: sudo make release-linux
           - host: macos-latest
             target: aarch64-apple-darwin
-            build: make release-mac-aarch_64  
+            build: sudo make release-mac-aarch_64  
           - host: macos-latest
             target: x86_64-apple-darwin
-            build: make release-mac-x86_64
+            build: sudo make release-mac-x86_64
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/server_build.yml b/.github/workflows/server_build.yml
index f0253cf..db8d49a 100644
--- a/.github/workflows/server_build.yml
+++ b/.github/workflows/server_build.yml
@@ -5,9 +5,6 @@ on:
       version:
         required: true
         description: "version to release"
-      branch:
-        default: main
-        description: "git branch"
     
 env:
   REGISTRY: ghcr.io
@@ -16,8 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.inputs.branch }}
       - uses: coursier/cache-action@v6
       - uses: coursier/setup-action@v1
         with:

From edf957bc4407bb3d1b8f1f2b5b9f9afcc61e5b44 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 00:10:18 +0800
Subject: [PATCH 16/41] fix cicd, step 16

---
 Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 6cc0d27..8cab329 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,9 @@
 
 	
 release-mac-x86_64: 
-	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && cp bin/* /usr/bin/
-	brew install cmake
+	base_dir=$(pwd)	
+	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && cp bin/* /usr/bin/ && cd $base_dir
+	brew install cmake	
 	mkdir -p release
 	cd client
 	cargo build --release
@@ -16,7 +17,8 @@ release-mac-x86_64:
 	ls -lisah ../release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch_64:
-	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && cp bin/* /usr/bin/
+	base_dir=$(pwd)	
+	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && cp bin/* /usr/bin/ && && cd $base_dir
 	brew install cmake
 	mkdir -p release
 	cd client
@@ -28,9 +30,10 @@ release-mac-aarch_64:
 	tar -C ./target/release/ -czvf ../release/fornet-mac-aarch_64.tar.gz ./fornet ./fornet-cli
 	ls -lisah ../release/fornet-mac-aarch_64.tar.gz
 
-release-linux:	
-	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cp bin/* /usr/bin/
-	apt-get install -y build-essential libssl-dev cmake
+release-linux:
+	base_dir=$(pwd)	
+	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cp bin/* /usr/bin/ && cd $base_dir
+	apt-get install -y build-essential libssl-dev cmake	
 	mkdir -p release
 	cd client
 	cargo build --release

From b97460b7b5781c2f8ec7e6f0adc817fe28983fda Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 00:15:35 +0800
Subject: [PATCH 17/41] fix cicd, step 17

---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 8cab329..e7e1a46 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@
 
 	
 release-mac-x86_64: 
-	base_dir=$(pwd)	
-	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && cp bin/* /usr/bin/ && cd $base_dir
+	base_dir = $(shell pwd)
+	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && cp bin/* /usr/bin/ && cd $(base_dir)
 	brew install cmake	
 	mkdir -p release
 	cd client
@@ -17,8 +17,8 @@ release-mac-x86_64:
 	ls -lisah ../release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch_64:
-	base_dir=$(pwd)	
-	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && cp bin/* /usr/bin/ && && cd $base_dir
+	base_dir = $(shell pwd)
+	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && cp bin/* /usr/bin/ && && cd $(base_dir)
 	brew install cmake
 	mkdir -p release
 	cd client
@@ -31,8 +31,8 @@ release-mac-aarch_64:
 	ls -lisah ../release/fornet-mac-aarch_64.tar.gz
 
 release-linux:
-	base_dir=$(pwd)	
-	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cp bin/* /usr/bin/ && cd $base_dir
+	base_dir = $(shell pwd)
+	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cp bin/* /usr/bin/ && cd $(base_dir)
 	apt-get install -y build-essential libssl-dev cmake	
 	mkdir -p release
 	cd client

From 7b6d295fda7ce12c8734c7547960af47681a58b2 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 00:23:23 +0800
Subject: [PATCH 18/41] fix cicd, step 18

---
 Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index e7e1a46..b6893f6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 # This is for .github/workflows.
 .PHONY: release-mac-x86_64, release-mac-aarch_64, release-linux, release-backend
 
+base_dir = $(shell pwd)
 	
-release-mac-x86_64: 
-	base_dir = $(shell pwd)
+release-mac-x86_64: 	
 	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && cp bin/* /usr/bin/ && cd $(base_dir)
 	brew install cmake	
 	mkdir -p release
@@ -17,7 +17,6 @@ release-mac-x86_64:
 	ls -lisah ../release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch_64:
-	base_dir = $(shell pwd)
 	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && cp bin/* /usr/bin/ && && cd $(base_dir)
 	brew install cmake
 	mkdir -p release
@@ -30,8 +29,7 @@ release-mac-aarch_64:
 	tar -C ./target/release/ -czvf ../release/fornet-mac-aarch_64.tar.gz ./fornet ./fornet-cli
 	ls -lisah ../release/fornet-mac-aarch_64.tar.gz
 
-release-linux:
-	base_dir = $(shell pwd)
+release-linux:	
 	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cp bin/* /usr/bin/ && cd $(base_dir)
 	apt-get install -y build-essential libssl-dev cmake	
 	mkdir -p release

From 63ee472f3e67b700e07a21db9049b07cb2fe16b6 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 00:23:49 +0800
Subject: [PATCH 19/41] fix cicd, step 18

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b6893f6..2495fbf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # This is for .github/workflows.
 .PHONY: release-mac-x86_64, release-mac-aarch_64, release-linux, release-backend
 
-base_dir = $(shell pwd)
+base_dir := $(shell pwd)
 	
 release-mac-x86_64: 	
 	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && cp bin/* /usr/bin/ && cd $(base_dir)

From c7b9b3bf2e0101ba315f50cdc1fd016d848ddb07 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 08:52:39 +0800
Subject: [PATCH 20/41] fix cicd, step 19

---
 .github/workflows/client_build.yml | 6 +++---
 Makefile                           | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index d6bc39e..f03a827 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -41,13 +41,13 @@ jobs:
         settings:
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            build: sudo make release-linux
+            build: make release-linux
           - host: macos-latest
             target: aarch64-apple-darwin
-            build: sudo make release-mac-aarch_64  
+            build: make release-mac-aarch_64  
           - host: macos-latest
             target: x86_64-apple-darwin
-            build: sudo make release-mac-x86_64
+            build: make release-mac-x86_64
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v3
diff --git a/Makefile b/Makefile
index 2495fbf..f7e4219 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 base_dir := $(shell pwd)
 	
 release-mac-x86_64: 	
-	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && cp bin/* /usr/bin/ && cd $(base_dir)
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && cp bin/* /usr/bin/ && cd ../
 	brew install cmake	
 	mkdir -p release
 	cd client
@@ -17,7 +17,7 @@ release-mac-x86_64:
 	ls -lisah ../release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch_64:
-	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && cp bin/* /usr/bin/ && && cd $(base_dir)
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && cp bin/* /usr/bin/ && && cd ../
 	brew install cmake
 	mkdir -p release
 	cd client
@@ -30,9 +30,10 @@ release-mac-aarch_64:
 	ls -lisah ../release/fornet-mac-aarch_64.tar.gz
 
 release-linux:	
-	mkdir /protoc && cd /protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cp bin/* /usr/bin/ && cd $(base_dir)
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cp bin/* /usr/bin/ && cd ../
 	apt-get install -y build-essential libssl-dev cmake	
-	mkdir -p release
+	mkdir release
+	pwd
 	cd client
 	cargo build --release
 	strip target/release/fornet

From 991fee7d5460374e0e0a749a410668f4b049f298 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 09:02:48 +0800
Subject: [PATCH 21/41] fix cicd, step 20

---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f7e4219..3147b76 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 # This is for .github/workflows.
 .PHONY: release-mac-x86_64, release-mac-aarch_64, release-linux, release-backend
 
-base_dir := $(shell pwd)
+#base_dir := $(shell pwd)
 	
 release-mac-x86_64: 	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && cp bin/* /usr/bin/ && cd ../
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && cd ../
+	export PATH=$(PWD)/protoc/bin:$$PATH
 	brew install cmake	
 	mkdir -p release
 	cd client
@@ -17,7 +18,8 @@ release-mac-x86_64:
 	ls -lisah ../release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch_64:
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && cp bin/* /usr/bin/ && && cd ../
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && cd ../
+	export PATH=$(PWD)/protoc/bin:$$PATH
 	brew install cmake
 	mkdir -p release
 	cd client
@@ -30,7 +32,8 @@ release-mac-aarch_64:
 	ls -lisah ../release/fornet-mac-aarch_64.tar.gz
 
 release-linux:	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cp bin/* /usr/bin/ && cd ../
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cd ../
+	export PATH=$(PWD)/protoc/bin:$$PATH
 	apt-get install -y build-essential libssl-dev cmake	
 	mkdir release
 	pwd

From e2f48cd42bf5ce04a42275aad34d97a2fd70d3d8 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 09:07:46 +0800
Subject: [PATCH 22/41] fix cicd, step 21

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3147b76..4009c19 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ release-mac-aarch_64:
 release-linux:	
 	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cd ../
 	export PATH=$(PWD)/protoc/bin:$$PATH
-	apt-get install -y build-essential libssl-dev cmake	
+	sudo apt-get install -y build-essential libssl-dev cmake	
 	mkdir release
 	pwd
 	cd client

From c8be1f4c60e3266f3a90763ce5a894a793190c8c Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 09:39:07 +0800
Subject: [PATCH 23/41] fix cicd, step 22

---
 Makefile | 50 +++++++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 4009c19..bb24224 100644
--- a/Makefile
+++ b/Makefile
@@ -4,44 +4,40 @@
 #base_dir := $(shell pwd)
 	
 release-mac-x86_64: 	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && cd ../
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip
 	export PATH=$(PWD)/protoc/bin:$$PATH
 	brew install cmake	
 	mkdir -p release
-	cd client
-	cargo build --release
-	strip target/release/fornet
-	otool -L target/release/fornet
-	strip target/release/fornet-cli
-	otool -L target/release/fornet-cli	
-	tar -C ./target/release/ -czvf ../release/fornet-mac-x86_64.tar.gz ./fornet ./fornet-cli
-	ls -lisah ../release/fornet-mac-x86_64.tar.gz
+	cd client && cargo build --release
+	strip client/target/release/fornet
+	otool -L client/target/release/fornet
+	strip client/target/release/fornet-cli
+	otool -L client/target/release/fornet-cli
+	tar -C client/target/release/ -czvf release/fornet-mac-x86_64.tar.gz ./fornet ./fornet-cli
+	ls -lisah release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch_64:
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && cd ../
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip
 	export PATH=$(PWD)/protoc/bin:$$PATH
 	brew install cmake
-	mkdir -p release
-	cd client
-	cargo build --release
-	strip target/release/fornet
-	otool -L target/release/fornet
-	strip target/release/fornet-cli
-	otool -L target/release/fornet-cli	
-	tar -C ./target/release/ -czvf ../release/fornet-mac-aarch_64.tar.gz ./fornet ./fornet-cli
-	ls -lisah ../release/fornet-mac-aarch_64.tar.gz
+	mkdir -p release	
+	cd client && cargo build --release
+	strip client/target/release/fornet
+	otool -L client/target/release/fornet
+	strip client/target/release/fornet-cli
+	otool -L client/target/release/fornet-cli	
+	tar -C client/target/release/ -czvf release/fornet-mac-aarch_64.tar.gz ./fornet ./fornet-cli
+	ls -lisah release/fornet-mac-aarch_64.tar.gz
 
 release-linux:	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && cd ../
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip
 	export PATH=$(PWD)/protoc/bin:$$PATH
 	sudo apt-get install -y build-essential libssl-dev cmake	
-	mkdir release
-	pwd
-	cd client
-	cargo build --release
-	strip target/release/fornet
-	strip target/release/fornet-cli
-	tar -C ./target/release/ -czvf ../release/fornet-linux-x86_64.tar.gz ./fornet ./fornet-cli
+	mkdir release	
+	cd client && cargo build --release
+	strip client/target/release/fornet
+	strip client/target/release/fornet-cli
+	tar -C client/target/release/ -czvf release/fornet-linux-x86_64.tar.gz ./fornet ./fornet-cli
 
 release-backend:
 	cd admin-web && npm ci && npm run build:prod && cd ../

From adc94a955a90aad66b3a0fe0b4aea19fd09f653c Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 20:55:12 +0800
Subject: [PATCH 24/41] fix cicd, step 23

---
 .github/workflows/client_build.yml | 30 +++++++++++++++++-------------
 Makefile                           | 14 +++++++-------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index f03a827..2b9e58f 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -42,31 +42,35 @@ jobs:
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             build: make release-linux
-          - host: macos-latest
-            target: aarch64-apple-darwin
-            build: make release-mac-aarch_64  
           - host: macos-latest
             target: x86_64-apple-darwin
             build: make release-mac-x86_64
+          - host: macos-latest
+            target: aarch64-apple-darwin
+            build make release-mac-aarch64 
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: actions-rs/toolchain@v1        
         with:
           toolchain: stable
-      - name: Cache cargo registry
-        uses: actions/cache@v2
-        with:
-          path: ~/.cargo/registry
-          key: ${{ matrix.settings.os }}-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
-      - name: Cache cargo index
-        uses: actions/cache@v2
+          target: ${{ matrix.settings.target }}
+          profile: minimal
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        continue-on-error: false
         with:
-          path: ~/.cargo/git
-          key: ${{ matrix.settings.os }}-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/            
+          key: ${{ matrix-settings.host }}-${{matrix-settings.target}}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
       - name: Build
         run: ${{ matrix.settings.build }}
 
diff --git a/Makefile b/Makefile
index bb24224..04e3983 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 # This is for .github/workflows.
-.PHONY: release-mac-x86_64, release-mac-aarch_64, release-linux, release-backend
+.PHONY: release-mac-x86_64, release-mac-aarch64, release-linux, release-backend
 
 #base_dir := $(shell pwd)
 	
 release-mac-x86_64: 	
 	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip
 	export PATH=$(PWD)/protoc/bin:$$PATH
-	brew install cmake	
+	brew install cmake
 	mkdir -p release
 	cd client && cargo build --release
 	strip client/target/release/fornet
@@ -16,25 +16,25 @@ release-mac-x86_64:
 	tar -C client/target/release/ -czvf release/fornet-mac-x86_64.tar.gz ./fornet ./fornet-cli
 	ls -lisah release/fornet-mac-x86_64.tar.gz
 
-release-mac-aarch_64:
+release-mac-aarch64:
 	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip
 	export PATH=$(PWD)/protoc/bin:$$PATH
 	brew install cmake
-	mkdir -p release	
+	mkdir -p release 	
 	cd client && cargo build --release
 	strip client/target/release/fornet
 	otool -L client/target/release/fornet
 	strip client/target/release/fornet-cli
 	otool -L client/target/release/fornet-cli	
-	tar -C client/target/release/ -czvf release/fornet-mac-aarch_64.tar.gz ./fornet ./fornet-cli
-	ls -lisah release/fornet-mac-aarch_64.tar.gz
+	tar -C client/target/release/ -czvf release/fornet-mac-aarch64.tar.gz ./fornet ./fornet-cli
+	ls -lisah release/fornet-mac-aarch64.tar.gz
 
 release-linux:	
 	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip
 	export PATH=$(PWD)/protoc/bin:$$PATH
 	sudo apt-get install -y build-essential libssl-dev cmake	
 	mkdir release	
-	cd client && cargo build --release
+	cd client && cargo build --release --target=x86_64-unknown-linux-gnu
 	strip client/target/release/fornet
 	strip client/target/release/fornet-cli
 	tar -C client/target/release/ -czvf release/fornet-linux-x86_64.tar.gz ./fornet ./fornet-cli

From 7fed227f79b9ed1ca8f3707835f27c60ceed1ee4 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 20:57:45 +0800
Subject: [PATCH 25/41] fix cicd, step 23

---
 .github/workflows/client_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 2b9e58f..110fbff 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -47,7 +47,7 @@ jobs:
             build: make release-mac-x86_64
           - host: macos-latest
             target: aarch64-apple-darwin
-            build make release-mac-aarch64 
+            build: make release-mac-aarch64 
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v3

From 3adb124ea3d8f91f200e6318627a763526c1c0fd Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 20:59:22 +0800
Subject: [PATCH 26/41] fix cicd, step 23

---
 .github/workflows/client_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 110fbff..545f58b 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -69,7 +69,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/            
-          key: ${{ matrix-settings.host }}-${{matrix-settings.target}}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.settings.host }}-${{matrix.settings.target}}-cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: ${{ runner.os }}-cargo-
       - name: Build
         run: ${{ matrix.settings.build }}

From 556292d550c98e4f589dab0817fae77a08dd9616 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 21:19:02 +0800
Subject: [PATCH 27/41] fix cicd, step 24

---
 .github/workflows/client_build.yml | 2 ++
 Makefile                           | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 545f58b..5654ef7 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -37,6 +37,8 @@ jobs:
   #         tags: ${{ env.REGISTRY }}/fornetcode/fornet:${{github.event.inputs.version}}
   commandLine:
     strategy:
+      max-parallel: 1
+      fail-fast: true
       matrix:
         settings:
           - host: ubuntu-latest
diff --git a/Makefile b/Makefile
index 04e3983..ead3a3e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 #base_dir := $(shell pwd)
 	
 release-mac-x86_64: 	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.x86_64.zip && unzip protoc-21.9-osx.x86_64.zip
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip
 	export PATH=$(PWD)/protoc/bin:$$PATH
 	brew install cmake
 	mkdir -p release
@@ -17,7 +17,7 @@ release-mac-x86_64:
 	ls -lisah release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch64:
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx.aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip
 	export PATH=$(PWD)/protoc/bin:$$PATH
 	brew install cmake
 	mkdir -p release 	

From 1edd310f4221d63dd978253a4eda2b20d3a1527e Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 21:26:56 +0800
Subject: [PATCH 28/41] fix cicd, step 25

---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ead3a3e..74223c9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@
 	
 release-mac-x86_64: 	
 	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip
-	export PATH=$(PWD)/protoc/bin:$$PATH
-	brew install cmake
+	export PROTOC=$(PWD)/protoc/bin
+	brew install cmake	
 	mkdir -p release
 	cd client && cargo build --release
 	strip client/target/release/fornet
@@ -17,8 +17,8 @@ release-mac-x86_64:
 	ls -lisah release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch64:
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip
-	export PATH=$(PWD)/protoc/bin:$$PATH
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip	
+	export PROTOC=$(PWD)/protoc/bin
 	brew install cmake
 	mkdir -p release 	
 	cd client && cargo build --release
@@ -30,8 +30,8 @@ release-mac-aarch64:
 	ls -lisah release/fornet-mac-aarch64.tar.gz
 
 release-linux:	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip
-	export PATH=$(PWD)/protoc/bin:$$PATH
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip	
+	export PROTOC=$(PWD)/protoc/bin
 	sudo apt-get install -y build-essential libssl-dev cmake	
 	mkdir release	
 	cd client && cargo build --release --target=x86_64-unknown-linux-gnu

From cd8fd82b40f4133474349b4318f0af16c35111ea Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 21:41:33 +0800
Subject: [PATCH 29/41] fix cicd, step 26

---
 Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 74223c9..1d7addc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,11 @@
 .PHONY: release-mac-x86_64, release-mac-aarch64, release-linux, release-backend
 
 #base_dir := $(shell pwd)
-	
+
+export PROTOC := $(shell pwd)/protoc/bin
+
 release-mac-x86_64: 	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip
-	export PROTOC=$(PWD)/protoc/bin
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip	
 	brew install cmake	
 	mkdir -p release
 	cd client && cargo build --release
@@ -17,8 +18,7 @@ release-mac-x86_64:
 	ls -lisah release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch64:
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip	
-	export PROTOC=$(PWD)/protoc/bin
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip		
 	brew install cmake
 	mkdir -p release 	
 	cd client && cargo build --release
@@ -30,8 +30,7 @@ release-mac-aarch64:
 	ls -lisah release/fornet-mac-aarch64.tar.gz
 
 release-linux:	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip	
-	export PROTOC=$(PWD)/protoc/bin
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip		
 	sudo apt-get install -y build-essential libssl-dev cmake	
 	mkdir release	
 	cd client && cargo build --release --target=x86_64-unknown-linux-gnu

From a969896f880f70f01803d43fd0be7f7fc6441937 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 22:01:53 +0800
Subject: [PATCH 30/41] fix cicd, step 27

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1d7addc..5717371 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 export PROTOC := $(shell pwd)/protoc/bin
 
 release-mac-x86_64: 	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip	
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && chmod +x bin/protoc	
 	brew install cmake	
 	mkdir -p release
 	cd client && cargo build --release
@@ -18,7 +18,7 @@ release-mac-x86_64:
 	ls -lisah release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch64:
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip		
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && chmod +x bin/protoc		
 	brew install cmake
 	mkdir -p release 	
 	cd client && cargo build --release
@@ -30,7 +30,7 @@ release-mac-aarch64:
 	ls -lisah release/fornet-mac-aarch64.tar.gz
 
 release-linux:	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip		
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && chmod +x bin/protoc
 	sudo apt-get install -y build-essential libssl-dev cmake	
 	mkdir release	
 	cd client && cargo build --release --target=x86_64-unknown-linux-gnu

From 8d9fc0f74ffbdac8b230ede43a13602f23542c76 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 22:22:19 +0800
Subject: [PATCH 31/41] fix cicd, step 28

---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5717371..da95637 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@
 export PROTOC := $(shell pwd)/protoc/bin
 
 release-mac-x86_64: 	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && chmod +x bin/protoc	
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && chmod +x bin/protoc
+	cp -r protoc/include/* protobuf/
 	brew install cmake	
 	mkdir -p release
 	cd client && cargo build --release
@@ -18,7 +19,8 @@ release-mac-x86_64:
 	ls -lisah release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch64:
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && chmod +x bin/protoc		
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && chmod +x bin/protoc
+	cp -r protoc/include/* protobuf/
 	brew install cmake
 	mkdir -p release 	
 	cd client && cargo build --release
@@ -31,6 +33,7 @@ release-mac-aarch64:
 
 release-linux:	
 	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && chmod +x bin/protoc
+	cp -r protoc/include/* protobuf/
 	sudo apt-get install -y build-essential libssl-dev cmake	
 	mkdir release	
 	cd client && cargo build --release --target=x86_64-unknown-linux-gnu

From 148b0c696dd7af0b7954b0615be863d9a555ae3b Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 22:28:10 +0800
Subject: [PATCH 32/41] fix cicd, step 29

---
 .github/workflows/client_build.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 5654ef7..3d29d90 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -71,13 +71,15 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/            
-          key: ${{ matrix.settings.host }}-${{matrix.settings.target}}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-
-      - name: Build
-        run: ${{ matrix.settings.build }}
+          key: ${{ matrix.settings.host }}-${{ matrix.settings.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ matrix.settings.host }}-cargo-${{ matrix.settings.target }}
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3          
+      # - name: Build
+      #   run: ${{ matrix.settings.build }}
 
-      - name: Upload artifact
-        uses: actions/upload-artifact@v2
-        with:
-          path: /release/*
-          if-no-files-found: error
\ No newline at end of file
+      # - name: Upload artifact
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     path: /release/*
+      #     if-no-files-found: error
\ No newline at end of file

From 484303695b075fb653adb77395c69bc38077604b Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 22:44:03 +0800
Subject: [PATCH 33/41] fix cicd, step 30

---
 .github/workflows/client_build.yml | 18 +++++++++---------
 Makefile                           |  9 ++++-----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 3d29d90..0c61f6b 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -73,13 +73,13 @@ jobs:
             target/            
           key: ${{ matrix.settings.host }}-${{ matrix.settings.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: ${{ matrix.settings.host }}-cargo-${{ matrix.settings.target }}
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3          
-      # - name: Build
-      #   run: ${{ matrix.settings.build }}
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3          
+      - name: Build
+        run: ${{ matrix.settings.build }}
 
-      # - name: Upload artifact
-      #   uses: actions/upload-artifact@v2
-      #   with:
-      #     path: /release/*
-      #     if-no-files-found: error
\ No newline at end of file
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          path: release/*
+          if-no-files-found: error
\ No newline at end of file
diff --git a/Makefile b/Makefile
index da95637..6352f1e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,10 @@
 
 #base_dir := $(shell pwd)
 
-export PROTOC := $(shell pwd)/protoc/bin
+#export PROTOC := $(shell pwd)/protoc/bin
 
 release-mac-x86_64: 	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && chmod +x bin/protoc
-	cp -r protoc/include/* protobuf/
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && sudo cp bin/protoc /usr/bin
 	brew install cmake	
 	mkdir -p release
 	cd client && cargo build --release
@@ -19,7 +18,7 @@ release-mac-x86_64:
 	ls -lisah release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch64:
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && chmod +x bin/protoc
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && sudo cp bin/protoc /usr/bin
 	cp -r protoc/include/* protobuf/
 	brew install cmake
 	mkdir -p release 	
@@ -32,7 +31,7 @@ release-mac-aarch64:
 	ls -lisah release/fornet-mac-aarch64.tar.gz
 
 release-linux:	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && chmod +x bin/protoc
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && sudo cp bin/protoc /usr/bin
 	cp -r protoc/include/* protobuf/
 	sudo apt-get install -y build-essential libssl-dev cmake	
 	mkdir release	

From 179ea3e999aeffb290bfb43a6ca13458bd30a690 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 22:53:12 +0800
Subject: [PATCH 34/41] fix cicd, step 31

---
 .github/workflows/client_build.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 0c61f6b..f6ce18a 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -73,13 +73,13 @@ jobs:
             target/            
           key: ${{ matrix.settings.host }}-${{ matrix.settings.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: ${{ matrix.settings.host }}-cargo-${{ matrix.settings.target }}
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3          
-      - name: Build
-        run: ${{ matrix.settings.build }}
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3          
+      # - name: Build
+      #   run: ${{ matrix.settings.build }}
 
-      - name: Upload artifact
-        uses: actions/upload-artifact@v2
-        with:
-          path: release/*
-          if-no-files-found: error
\ No newline at end of file
+      # - name: Upload artifact
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     path: release/*
+      #     if-no-files-found: error
\ No newline at end of file

From b4c0bb4742283509761b490b4328561e3dfb524e Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 23:12:45 +0800
Subject: [PATCH 35/41] fix cicd, step 32

---
 .github/workflows/client_build.yml |  2 +-
 Makefile                           | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index f6ce18a..8a111e5 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -49,7 +49,7 @@ jobs:
             build: make release-mac-x86_64
           - host: macos-latest
             target: aarch64-apple-darwin
-            build: make release-mac-aarch64 
+            build: make release-mac-aarch64
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v3
diff --git a/Makefile b/Makefile
index 6352f1e..7bab548 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,12 @@ release-mac-x86_64:
 	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && sudo cp bin/protoc /usr/bin
 	brew install cmake	
 	mkdir -p release
-	cd client && cargo build --release
-	strip client/target/release/fornet
-	otool -L client/target/release/fornet
-	strip client/target/release/fornet-cli
-	otool -L client/target/release/fornet-cli
-	tar -C client/target/release/ -czvf release/fornet-mac-x86_64.tar.gz ./fornet ./fornet-cli
+	cd client && cargo build --release  --target=x86_64-apple-darwin
+	strip client/target/x86_64-apple-darwin/release/fornet
+	otool -L client/target/x86_64-apple-darwin/release/fornet
+	strip client/target/x86_64-apple-darwin/release/fornet-cli
+	otool -L client/target/x86_64-apple-darwin/release/fornet-cli
+	tar -C client/target/x86_64-apple-darwin/release/ -czvf release/fornet-mac-x86_64.tar.gz ./fornet ./fornet-cli
 	ls -lisah release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch64:
@@ -22,12 +22,12 @@ release-mac-aarch64:
 	cp -r protoc/include/* protobuf/
 	brew install cmake
 	mkdir -p release 	
-	cd client && cargo build --release
-	strip client/target/release/fornet
-	otool -L client/target/release/fornet
-	strip client/target/release/fornet-cli
-	otool -L client/target/release/fornet-cli	
-	tar -C client/target/release/ -czvf release/fornet-mac-aarch64.tar.gz ./fornet ./fornet-cli
+	cd client && cargo build --release --target=aarch64-apple-darwin
+	strip client/target/aarch64-apple-darwin/release/fornet
+	otool -L client/target/aarch64-apple-darwin/release/fornet
+	strip client/target/aarch64-apple-darwin/release/fornet-cli
+	otool -L client/target/aarch64-apple-darwin/release/fornet-cli	
+	tar -C client/target/aarch64-apple-darwin/release/ -czvf release/fornet-mac-aarch64.tar.gz ./fornet ./fornet-cli
 	ls -lisah release/fornet-mac-aarch64.tar.gz
 
 release-linux:	
@@ -36,9 +36,9 @@ release-linux:
 	sudo apt-get install -y build-essential libssl-dev cmake	
 	mkdir release	
 	cd client && cargo build --release --target=x86_64-unknown-linux-gnu
-	strip client/target/release/fornet
-	strip client/target/release/fornet-cli
-	tar -C client/target/release/ -czvf release/fornet-linux-x86_64.tar.gz ./fornet ./fornet-cli
+	strip client/target/x86_64-unknown-linux-gnu/release/fornet
+	strip client/target/x86_64-unknown-linux-gnu/release/fornet-cli
+	tar -C client/target/x86_64-unknown-linux-gnu/release/ -czvf release/fornet-linux-x86_64.tar.gz ./fornet ./fornet-cli
 
 release-backend:
 	cd admin-web && npm ci && npm run build:prod && cd ../

From 49b450066058b94a34a0f1162855e7f44d1065cc Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 23:15:45 +0800
Subject: [PATCH 36/41] fix cicd, step 32

---
 .github/workflows/client_build.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 8a111e5..84a7038 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -73,13 +73,13 @@ jobs:
             target/            
           key: ${{ matrix.settings.host }}-${{ matrix.settings.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: ${{ matrix.settings.host }}-cargo-${{ matrix.settings.target }}
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3          
-      # - name: Build
-      #   run: ${{ matrix.settings.build }}
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
+      - name: Build
+        run: ${{ matrix.settings.build }}
 
-      # - name: Upload artifact
-      #   uses: actions/upload-artifact@v2
-      #   with:
-      #     path: release/*
-      #     if-no-files-found: error
\ No newline at end of file
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          path: release/*
+          if-no-files-found: error
\ No newline at end of file

From 93df238eed6672ea8ed52416ae423f3539f87cad Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 23:23:33 +0800
Subject: [PATCH 37/41] fix cicd, step 33

---
 .github/workflows/client_build.yml | 10 +++++-----
 Makefile                           |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 84a7038..5148e11 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -41,9 +41,9 @@ jobs:
       fail-fast: true
       matrix:
         settings:
-          - host: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-            build: make release-linux
+          # - host: ubuntu-latest
+          #   target: x86_64-unknown-linux-gnu
+          #   build: make release-linux
           - host: macos-latest
             target: x86_64-apple-darwin
             build: make release-mac-x86_64
@@ -73,8 +73,8 @@ jobs:
             target/            
           key: ${{ matrix.settings.host }}-${{ matrix.settings.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: ${{ matrix.settings.host }}-cargo-${{ matrix.settings.target }}
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
       - name: Build
         run: ${{ matrix.settings.build }}
 
diff --git a/Makefile b/Makefile
index 7bab548..611a1ce 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #export PROTOC := $(shell pwd)/protoc/bin
 
 release-mac-x86_64: 	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx.x86_64.zip && sudo cp bin/protoc /usr/bin
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx-x86_64.zip && sudo cp bin/protoc /usr/bin
 	brew install cmake	
 	mkdir -p release
 	cd client && cargo build --release  --target=x86_64-apple-darwin
@@ -18,7 +18,7 @@ release-mac-x86_64:
 	ls -lisah release/fornet-mac-x86_64.tar.gz
 
 release-mac-aarch64:
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx.aarch_64.zip && sudo cp bin/protoc /usr/bin
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx-aarch_64.zip && sudo cp bin/protoc /usr/bin
 	cp -r protoc/include/* protobuf/
 	brew install cmake
 	mkdir -p release 	

From 9ee2c55e6c88d2b9fafc2751482ec574ad0aa712 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 23:42:48 +0800
Subject: [PATCH 38/41]  fix cicd, step 34

---
 Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 611a1ce..6fda2c5 100644
--- a/Makefile
+++ b/Makefile
@@ -6,21 +6,19 @@
 #export PROTOC := $(shell pwd)/protoc/bin
 
 release-mac-x86_64: 	
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx-x86_64.zip && sudo cp bin/protoc /usr/bin
-	brew install cmake	
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-x86_64.zip && unzip protoc-21.9-osx-x86_64.zip && sudo cp bin/protoc /usr/local/bin
+	cp -r protoc/include/* protobuf/
 	mkdir -p release
 	cd client && cargo build --release  --target=x86_64-apple-darwin
 	strip client/target/x86_64-apple-darwin/release/fornet
 	otool -L client/target/x86_64-apple-darwin/release/fornet
 	strip client/target/x86_64-apple-darwin/release/fornet-cli
 	otool -L client/target/x86_64-apple-darwin/release/fornet-cli
-	tar -C client/target/x86_64-apple-darwin/release/ -czvf release/fornet-mac-x86_64.tar.gz ./fornet ./fornet-cli
-	ls -lisah release/fornet-mac-x86_64.tar.gz
+	tar -C client/target/x86_64-apple-darwin/release/ -czvf release/fornet-mac-x86_64.tar.gz ./fornet ./fornet-cli	
 
 release-mac-aarch64:
-	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx-aarch_64.zip && sudo cp bin/protoc /usr/bin
+	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-osx-aarch_64.zip && unzip protoc-21.9-osx-aarch_64.zip && sudo cp bin/protoc /usr/local/bin
 	cp -r protoc/include/* protobuf/
-	brew install cmake
 	mkdir -p release 	
 	cd client && cargo build --release --target=aarch64-apple-darwin
 	strip client/target/aarch64-apple-darwin/release/fornet
@@ -28,7 +26,6 @@ release-mac-aarch64:
 	strip client/target/aarch64-apple-darwin/release/fornet-cli
 	otool -L client/target/aarch64-apple-darwin/release/fornet-cli	
 	tar -C client/target/aarch64-apple-darwin/release/ -czvf release/fornet-mac-aarch64.tar.gz ./fornet ./fornet-cli
-	ls -lisah release/fornet-mac-aarch64.tar.gz
 
 release-linux:	
 	mkdir protoc && cd protoc && wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip && unzip protoc-21.9-linux-x86_64.zip && sudo cp bin/protoc /usr/bin

From cc989be099f4652ed3ac616c5dd8f6f812665b9b Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sat, 13 May 2023 23:43:51 +0800
Subject: [PATCH 39/41]  fix cicd, step 34

---
 .github/workflows/client_build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 5148e11..535e1be 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -73,8 +73,8 @@ jobs:
             target/            
           key: ${{ matrix.settings.host }}-${{ matrix.settings.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: ${{ matrix.settings.host }}-cargo-${{ matrix.settings.target }}
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
       - name: Build
         run: ${{ matrix.settings.build }}
 

From 2231aed7ff80c0f55e4ff7c96b6d42416ce51813 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sun, 14 May 2023 00:06:38 +0800
Subject: [PATCH 40/41] fix cicd, step 35

---
 .github/workflows/client_build.yml | 66 +++++++++++++++---------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 535e1be..8b55265 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -8,48 +8,48 @@ on:
 env:
   REGISTRY: ghcr.io
 jobs:
-  # docker:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         submodules: true
-  #     -
-  #       name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v2
-  #     -
-  #       name: Login to GithubPackages
-  #       uses: docker/login-action@v2
-  #       with:
-  #         registry: ${{ env.REGISTRY }}
-  #         username: ${{ github.actor }}
-  #         password: ${{ secrets.GITHUB_TOKEN }}
-  #     -
-  #       name: build and push docker image
-  #       uses: docker/build-push-action@v2
-  #       with:
-  #         context: .
-  #         #platforms: linux/amd64,linux/arm64
-  #         push: true
-  #         file: command/docker/client/client.Dockerfile
-  #         cache-from: type=gha
-  #         cache-to: type=gha,mode=max
-  #         tags: ${{ env.REGISTRY }}/fornetcode/fornet:${{github.event.inputs.version}}
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to GithubPackages
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: build and push docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          #platforms: linux/amd64,linux/arm64
+          push: true
+          file: command/docker/client/client.Dockerfile
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ${{ env.REGISTRY }}/fornetcode/fornet:${{github.event.inputs.version}}
   commandLine:
     strategy:
       max-parallel: 1
       fail-fast: true
       matrix:
         settings:
-          # - host: ubuntu-latest
-          #   target: x86_64-unknown-linux-gnu
-          #   build: make release-linux
+          - host: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            build: make release-linux
           - host: macos-latest
             target: x86_64-apple-darwin
             build: make release-mac-x86_64
-          - host: macos-latest
-            target: aarch64-apple-darwin
-            build: make release-mac-aarch64
+          # - host: macos-latest # This needs aarch64 OpenSSL, will wait github action support MacOS M1(https://github.com/github/roadmap/issues/528), then run this.
+          #   target: aarch64-apple-darwin
+          #   build: make release-mac-aarch64
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v3

From 3c2fd852111b88c72680f7d18351b424d5a99d41 Mon Sep 17 00:00:00 2001
From: timzaak <zsy.evan@gmail.com>
Date: Sun, 14 May 2023 00:11:24 +0800
Subject: [PATCH 41/41] fix cicd, step 36

---
 .github/workflows/client_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
index 8b55265..94b7ef0 100644
--- a/.github/workflows/client_build.yml
+++ b/.github/workflows/client_build.yml
@@ -70,7 +70,7 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-            target/            
+            client/target/            
           key: ${{ matrix.settings.host }}-${{ matrix.settings.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: ${{ matrix.settings.host }}-cargo-${{ matrix.settings.target }}
       # - name: Setup tmate session