From 472c349220676b7c9cbd71566dc40fa4908959f5 Mon Sep 17 00:00:00 2001 From: litianxiang Date: Tue, 5 May 2026 17:24:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master_gateway_build_manual.yaml | 44 +++++++++---------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/.gitea/workflows/master_gateway_build_manual.yaml b/.gitea/workflows/master_gateway_build_manual.yaml index 66a47bf..bb04a0c 100644 --- a/.gitea/workflows/master_gateway_build_manual.yaml +++ b/.gitea/workflows/master_gateway_build_manual.yaml @@ -26,41 +26,37 @@ jobs: with: ref: master - - name: 2.设置 JDK 21 + - name: 2.Set up JDK 21 uses: actions/setup-java@v5 with: java-version: '21' distribution: 'temurin' - - name: 3.安装 Maven 并缓存 - id: cache_maven - uses: actions/cache@v4 - with: - path: | - /usr/local/apache-maven-* - ~/.m2 - key: maven-3.9.11-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: | - maven-3.9.11-m2- - maven-3.9.11- - - - name: 3.1 安装 Maven(如缓存未命中) - if: steps.cache_maven.outputs.cache-hit != 'true' + - name: 3.设置JAVA Maven 环境 run: | + # 适配root/普通用户 + SUDO="" + [ "$(id -u)" != "0" ] && SUDO="sudo" + + # 安装依赖 + $SUDO apt update && $SUDO apt install -y wget tar --no-install-recommends + + # 下载Maven MAVEN_VERSION="3.9.11" MAVEN_TAR="apache-maven-${MAVEN_VERSION}-bin.tar.gz" MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_TAR}" wget --no-verbose -O /tmp/${MAVEN_TAR} ${MAVEN_URL} - sudo tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/ - sudo ln -nsf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven - export PATH="/usr/local/maven/bin:$PATH" - mvn -v - - name: 3.2 验证 Maven(缓存命中时) - if: steps.cache_maven.outputs.cache-hit == 'true' - run: | + # 解压+软链接 + $SUDO tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/ + $SUDO ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven + + # 配置PATH + echo "/usr/local/maven/bin" >> $GITHUB_PATH export PATH="/usr/local/maven/bin:$PATH" - mvn -v + + # 验证 + mvn -v - name: 4.构建jar包 run: | @@ -121,7 +117,7 @@ jobs: - name: 7.安装SSH工具 run: | - apt install -y sshpass openssh-client --no-install-recommends + $SUDO apt install -y sshpass openssh-client --no-install-recommends # 配置SSH免密 mkdir -p ~/.ssh echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_rsa