From f28157a865884bdb836d57447fd9614826f90245 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Wed, 5 Jun 2024 23:28:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20ubuntu=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E7=9A=8422.04=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker-image.yml  | 20 ++++++--------------
 .github/workflows/maven-publish.yml | 10 +---------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 9dc0e3a5..a9538f16 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,45 +1,37 @@
 name: DockerHub - Build & Push
-
 on:
   push:
     tags:
       - v*
-
 jobs:
   build:
-
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: maven
-
       - name: Build with Maven
         run: mvn -B package --file pom.xml
-
-
       - name: Get Maven project version
         id: version
         run: |
-          echo "::set-output name=version::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
-
+          echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> "$GITHUB_OUTPUT"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and push Docker image
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          VERSION: ${{ steps.version.outputs.version }}
         run: |
           docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
           cd snail-job-server/snail-job-server-starter/ \
             && docker buildx build --platform linux/amd64,linux/arm64 \
             -t opensnail/snail-job:latest \
-            -t opensnail/snail-job:${{ steps.version.outputs.version }} \
+            -t opensnail/snail-job:$VERSION \
             --push .
\ No newline at end of file
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 005cd0c2..ac533800 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -1,28 +1,21 @@
 name: Maven - Build & Publish
-
 on:
   push:
     tags:
       - v*
-
 jobs:
   build:
-
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: maven
-
       - name: Build with Maven
         run: mvn -B package --file pom.xml
-
       - name: Set up Apache Maven Central
         uses: actions/setup-java@v4
         with: # running setup-java again overwrites the settings.xml
@@ -33,7 +26,6 @@ jobs:
           server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy
           gpg-private-key: ${{ secrets.GPG_SECRET }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
-
       - name: Publish to Apache Maven Central
         run: mvn deploy -P release -f pom.xml
         env: