添加 release.sh 脚本

.github/workflows/release.yml

@@ -38,10 +38,8 @@ jobs:
         run: |
           mkdir server/ui
           touch server/ui/index.html
-          sudo apt-get install -y -q gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+          #sudo apt-get install -y -q gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
-          aarch64-linux-gnu-gcc -v 
+          bash Z:\goweb\anylink\release.sh
-          aarch64-linux-gnu-g++ -v
-          bash build.sh github_action
 
 #  Docker:
 #    name: build-docker

.goreleaser.yaml

@@ -6,7 +6,7 @@
 
 # GOPROXY=https://goproxy.cn
 
-# docker run -it --rm -v $PWD:/app -v /go:/go -w /app --platform=linux/arm64
+# docker run -it --rm -v $PWD:/app -v /go:/go -w /app --platform=linux/arm64 golang:alpine3.19
 
 # docker run -it --rm -v $PWD:/app -v /go:/go -w /app goreleaser/goreleaser-cross build --skip=validate --clean --debug
 

build.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-github_action=$1
-
 set -x
 function RETVAL() {
   rt=$1
@@ -14,22 +12,16 @@ function RETVAL() {
 #当前目录
 cpath=$(pwd)
 
-#ver=`cat server/base/app_ver.go | grep APP_VER | awk '{print $3}' | sed 's/"//g'`
 ver=$(cat version)
 echo "当前版本 $ver"
 
 echo "编译前端项目"
 cd $cpath/web
+
 #国内可替换源加快速度
 #npx browserslist@latest --update-db
-if [ "$github_action" == "github_action" ]; then
+yarn install --registry=https://registry.npmmirror.com
-  yarn install
-else
-  yarn install --registry=https://registry.npmmirror.com
-fi
-
 yarn run build
-
 RETVAL $?
 
 echo "编译二进制文件"
@@ -37,49 +29,17 @@ cd $cpath/server
 rm -rf ui
 cp -rf $cpath/web/ui .
 
-flags="-v -trimpath -tags osusergo,netgo,sqlite_omit_load_extension"
+# -tags osusergo,netgo,sqlite_omit_load_extension
+flags="-v -trimpath"
 ldflags="-s -w -extldflags '-static' -X main.appVer=$ver -X main.commitId=$(git rev-parse HEAD) -X main.date=$(date --iso-8601=seconds)"
 
-if [ "$github_action" == "github_action" ]; then
+#国内可替换源加快速度
-  echo "github_action"
+export GOPROXY=https://goproxy.io
-else
-  #国内可替换源加快速度
-  export GOPROXY=https://goproxy.io
-  go mod tidy
-  go build -o anylink "$flags" -ldflags "$ldflags"
-  exit 0
-fi
-
-#github action
 go mod tidy
-go build -o anylink_amd64 $flags -ldflags "$ldflags"
+go build -o anylink "$flags" -ldflags "$ldflags"
-
-#arm64交叉编译
-CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ go build -o anylink_arm64 $flags -ldflags "$ldflags"
-
-./anylink_amd64 -v
-./anylink_arm64 -v
-
-exit 0
 
 cd $cpath
 
-echo "整理部署文件"
-deploy="anylink-deploy"
-rm -rf $deploy ${deploy}.tar.gz
-mkdir $deploy
-mkdir $deploy/log
-
-cp -r server/anylink $deploy
-cp -r server/bridge-init.sh $deploy
-cp -r server/conf $deploy
-
-cp -r systemd $deploy
-cp -r LICENSE $deploy
-cp -r home $deploy
-
-tar zcvf ${deploy}.tar.gz $deploy
-
 #注意使用root权限运行
 #cd anylink-deploy
 #sudo ./anylink --conf="conf/server.toml"

release.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+#github action release.sh
+
+set -x
+function RETVAL() {
+  rt=$1
+  if [ $rt != 0 ]; then
+    echo $rt
+    exit 1
+  fi
+}
+
+#当前目录
+cpath=$(pwd)
+
+#ver=`cat server/base/app_ver.go | grep APP_VER | awk '{print $3}' | sed 's/"//g'`
+ver=$(cat version)
+echo "当前版本 $ver"
+
+echo "编译前端项目"
+cd $cpath/web
+#国内可替换源加快速度
+#npx browserslist@latest --update-db
+#yarn install
+#yarn run build
+#RETVAL $?
+#rm -rf $cpath/server/ui
+#cp -rf $cpath/web/ui . $cpath/server/ui
+
+echo "编译二进制文件"
+cd $cpath/server
+
+# -tags osusergo,netgo,sqlite_omit_load_extension
+flags="-v -trimpath"
+ldflags="-s -w -extldflags '-static' -X main.appVer=$ver -X main.commitId=$(git rev-parse HEAD) -X main.date=$(date --iso-8601=seconds)"
+
+#github action
+gopath=$(go env GOPATH)
+go mod tidy
+
+#使用 musl-dev 编译
+docker run -it --rm -v $PWD:/app -v $gopath:/go -w /app --platform=linux/amd64 \
+  golang:1.20-alpine3.19 go build -o anylink_amd64 $flags -ldflags "$ldflags"
+#arm64交叉编译
+docker run -it --rm -v $PWD:/app -v $gopath:/go -w /app --platform=linux/arm64 \
+  golang:1.20-alpine3.19 go build -o anylink_amd64 $flags -ldflags "$ldflags"
+
+./anylink_amd64 -v
+./anylink_arm64 -v
+
+exit 0
+
+cd $cpath
+
+echo "整理部署文件"
+deploy="anylink-deploy"
+rm -rf $deploy ${deploy}.tar.gz
+mkdir $deploy
+mkdir $deploy/log
+
+cp -r server/anylink $deploy
+cp -r server/bridge-init.sh $deploy
+cp -r server/conf $deploy
+
+cp -r systemd $deploy
+cp -r LICENSE $deploy
+cp -r home $deploy
+
+tar zcvf ${deploy}.tar.gz $deploy
+
+#注意使用root权限运行
+#cd anylink-deploy
+#sudo ./anylink --conf="conf/server.toml"