diff --git a/.cnb.yml b/.cnb.yml index 150adbe3d..1646afb95 100644 --- a/.cnb.yml +++ b/.cnb.yml @@ -12,13 +12,13 @@ main: username: ${GIT_USERNAME} password: ${GIT_ACCESS_TOKEN} - # ========== 生成版本号 ========== + # ========== 生成版本号(作为前置步骤) ========== - name: set version image: golang:1.25 commands: - VERSION="v$(git rev-parse --short=8 HEAD 2>/dev/null || echo "unknown")" - - mkdir -p /tmp/build-info - - echo "BUILD_VERSION=${VERSION}" >> /tmp/build-info/.env + - mkdir -p .build-info + - echo "BUILD_VERSION=${VERSION}" >> .build-info/.env - echo "构建版本号:${VERSION}" # ========== 缓存Go依赖 ========== @@ -39,14 +39,15 @@ main: GO111MODULE: on GOSUMDB: off commands: - - source /tmp/build-info/.env || true + - VERSION="v$(git rev-parse --short=8 HEAD 2>/dev/null || echo "unknown")" + - BUILD_VERSION="${VERSION}" - mkdir -p build - - BIN_NAME="logic_${BUILD_VERSION:-unknown}" + - BIN_NAME="logic_${BUILD_VERSION}" - go mod download -x - go build -v -p=4 -trimpath -buildvcs=false -ldflags "-s -w -buildid= -extldflags '-static'" -o ./build/${BIN_NAME} ./logic - ls -lh ./build/ - - echo "BUILD_VERSION=${BUILD_VERSION}" >> /tmp/build-info/.env - - cat /tmp/build-info/.env + - echo "BUILD_VERSION=${BUILD_VERSION}" >> .build-info/.env + - cat .build-info/.env # ========== 编译Login服务 ========== - name: build login @@ -56,7 +57,8 @@ main: GO111MODULE: on GOSUMDB: off commands: - - source /tmp/build-info/.env || true + - VERSION="v$(git rev-parse --short=8 HEAD 2>/dev/null || echo "unknown")" + - BUILD_VERSION="${VERSION}" - cd login - mkdir -p build - BIN_NAME="login_${BUILD_VERSION:-unknown}" @@ -96,12 +98,12 @@ main: REMOTE_PASSWORDS=$(jq -r '.password' /tmp/deploy-config.json) REMOTE_ONLINE_IDS=$(jq -r '.online_id' /tmp/deploy-config.json) fi - - mkdir -p /tmp/build-info || true - - echo "REMOTE_HOSTS=${REMOTE_HOSTS}" >> /tmp/build-info/.env 2>/dev/null || true - - echo "REMOTE_USERS=${REMOTE_USERS}" >> /tmp/build-info/.env 2>/dev/null || true - - echo "REMOTE_PASSWORDS=${REMOTE_PASSWORDS}" >> /tmp/build-info/.env 2>/dev/null || true - - echo "REMOTE_ONLINE_IDS=${REMOTE_ONLINE_IDS}" >> /tmp/build-info/.env 2>/dev/null || true - - cat /tmp/build-info/.env 2>/dev/null || true + - mkdir -p .build-info + - echo "REMOTE_HOSTS=${REMOTE_HOSTS}" >> .build-info/.env + - echo "REMOTE_USERS=${REMOTE_USERS}" >> .build-info/.env + - echo "REMOTE_PASSWORDS=${REMOTE_PASSWORDS}" >> .build-info/.env + - echo "REMOTE_ONLINE_IDS=${REMOTE_ONLINE_IDS}" >> .build-info/.env + - cat .build-info/.env # ========== SCP推送产物到服务器 ========== - name: scp to servers @@ -112,9 +114,9 @@ main: password: ${REMOTE_PASSWORDS} source: - ./build/logic_* - - /tmp/build-info/.env + - .build-info/.env target: /opt/logic/ - strip_components: 3 + strip_components: 2 skip_verify: true # ========== SCP推送Login到指定服务器 ========== @@ -173,7 +175,7 @@ main: password: ${REMOTE_PASSWORDS} script: - cd /opt/logic - - source /opt/logic/.env || { echo "❌ 找不到.env文件"; exit 1; } + - source .env || { echo "❌ 找不到.env文件"; exit 1; } - | # 获取当前服务器在数组中的索引(通过IP匹配) CURRENT_HOST=$(hostname -I | awk '{print $1}')