[CICD] fix github actions

.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
@@ -33,49 +29,57 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          #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}}
+          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: 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
-    runs-on: ${{ matrix.settings.os }}
+          # - 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
         with:
           submodules: true
       - name: Install Rust
-        uses: actions-rs/toolchain@v2
+        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/
+            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
+      #   uses: mxschmitt/action-tmate@v3
       - name: Build
         run: ${{ matrix.settings.build }}
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          path: /release/*
+          path: release/*
           if-no-files-found: error

.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,17 +13,16 @@ 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:
           jvm: temurin:1.17
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: lts
-          cache: 'npm'        
+          node-version: 18
+          cache: 'npm'
+          cache-dependency-path: 'admin-web/package-lock.json'
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       -
@@ -42,9 +38,9 @@ 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
           cache-to: type=gha,mode=max
-          tags: fornetcode/fornet-backend:${{github.event.inputs.version}}
+          tags: ${{ env.REGISTRY }}/fornetcode/fornet-backend:${{github.event.inputs.version}}

Makefile

@@ -1,45 +1,44 @@
 # 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
 
-
-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
-	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
+#base_dir := $(shell pwd)
 
-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/
-	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
+#export PROTOC := $(shell pwd)/protoc/bin
 
-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/
-	apt-get install -y build-essential libssl-dev cmake
+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/local/bin
+	cp -r protoc/include/* protobuf/
 	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
+	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	
+
+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/local/bin
+	cp -r protoc/include/* protobuf/
+	mkdir -p release 	
+	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
+
+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
+	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
+	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
-	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
+	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 backend/target/universal/app-*.zip command/docker/backend/app.zip && cd command/docker/backend && unzip app.zip && rm app.zip && mv app-* app

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

admin-web/.env

@@ -1,3 +1,4 @@
 BROWSER=none
 REACT_APP_BASE_API="/api"
+
 # FAST_REFRESH=false # trigger this to force refresh less config. 来回改它可强制刷新样式配置

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(() => {

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 <></>

command/docker/client/client.Dockerfile

@@ -9,25 +9,26 @@ 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
 
 
-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 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
+    cd /source/client && cargo build --release
 
-FROM ${RUNTIME_IMAGE}
+FROM --platform=$BUILDPLATFORM  ${RUNTIME_IMAGE}
 
 ENV FORNET_CONFIG=/config
 

command/docker/client/client.Dockerfile.dockerignore

@@ -6,6 +6,7 @@
 /app
 /backend
 /command
+!/command/docker/client
 /docs
 /java_backend
 /node_modules

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/