eolinker · Dot-Liu · Jun 25, 2024 · Jun 25, 2024 · Jun 25, 2024 · Jun 25, 2024
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -17,9 +17,10 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v3.0.0
         with:
-          node-version: '16'
+          node-version: '18.12'
       - name: Pnpm install and build
         run: |
+          npm install -g pnpm
           pnpm install --registry https://registry.npmmirror.com --dir ./frontend
           echo "Build frontend..."
           cd ./frontend && pnpm run build
@@ -55,7 +56,7 @@ jobs:
       - name: Create archives on Release   #创建各种系统架构下的二进制包并上传至release assets
         uses: goreleaser/goreleaser-action@v3.1.0
         with:
-          version: latest
+          version: 1.9.2
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -88,7 +89,7 @@ jobs:
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: build
-        run: cd scripts && ./docker_publish.sh
+        run: cd scripts && ./docker_publish.sh ${{ secrets.DOCKER_USERNAME }} "backend"
 #
 #      - name: push image
 #        run: |

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -1,4 +1,5 @@
 # .goreleaser.yml
+#version: 2
 dist: build
 
 builds:

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 cd "$(dirname "$0")/../"
 LOCAL_PATH=$(pwd)
@@ -53,12 +53,12 @@ env_check() {
   fi
   echo "Npm is installed."
 
-  # 检查是否安装了 pnpm
-  if ! command -v pnpm &> /dev/null; then
-    echo_error "Pnpm is not installed. Please install Pnpm."
-    exit 1
-  fi
-  echo "Pnpm is installed."
+#  # 检查是否安装了 pnpm
+#  if ! command -v pnpm &> /dev/null; then
+#    echo_error "Pnpm is not installed. Please install Pnpm."
+#    exit 1
+#  fi
+#  echo "Pnpm is installed."
 
   # 如果所有检查都通过，打印环境检查通过的消息
   echo_info "All required tools are installed."

diff --git a/scripts/common.sh b/scripts/common.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # ===========================================================================
 # File: common.sh

diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh
@@ -1,18 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
 cd "$(dirname "$0")/../"
 LOCAL_PATH=$(pwd)
 ARCH=$1
 User=$2
+BuildMode=$3
+if [[ "${BuildMode}" == "" ]];then
+  BuildMode="all"
+fi
 # 编译可执行文件
-./scripts/build.sh "cmd" "" "all" ${ARCH}
+./scripts/build.sh "cmd" "" "${BuildMode}" ${ARCH}
 
 source ./scripts/common.sh
 APP="apipark"
 
-cp cmd/${APP} scripts/cmd/
+
+mkdir -p scripts/cmd/ && cp cmd/${APP} scripts/cmd/
 
 VERSION=$(gen_version)
 

diff --git a/scripts/docker_publish.sh b/scripts/docker_publish.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 
 
@@ -12,15 +12,19 @@ App="apipark"
 if [[ "${User}" == "" ]];then
   User="eolinker"
 fi
+BuildMode=$2
+if [[ "${BuildMode}" == "" ]];then
+  BuildMode="all"
+fi
 Version=$(gen_version)
 ImageName="${User}/${App}"
 echo "docker manifest rm  \"${ImageName}:${Version}\""
 docker manifest rm "${ImageName}:${Version}"
 
 set -e
-./scripts/docker_build.sh amd64
+./scripts/docker_build.sh amd64 ${User} "${BuildMode}"
 
-./scripts/docker_build.sh arm64
+./scripts/docker_build.sh arm64 ${User} "${BuildMode}"