Merge pull request #105 from GiganticMinecraft/refactor/actions

Refactor CI
GiganticMinecraft · Jan 26, 2025 · a2573a9 · a2573a9
2 parents 313c6ac + fe42728
commit a2573a9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 30 deletions.
diff --git a/.github/actions/output-latest-tag/action.yml b/.github/actions/output-latest-tag/action.yml
@@ -10,6 +10,6 @@ runs:
     - name: Output tag
       id: latest-tag
       run: |
-        LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
+        LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
         echo "new-ver=$LATEST_TAG" >> $GITHUB_OUTPUT
       shell: bash
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -7,18 +7,19 @@ jobs:
   bump:
     name: Bump version
     runs-on: ubuntu-latest
-    outputs:
-      new-ver: ${{ steps.output-ver.outputs.new-ver }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup Java & Gradle
-        uses: ./.github/actions/setup
-      - name: Bump version
-        uses: gradle/gradle-build-action@v3
+      - name: Setup Java
+        uses: actions/setup-java@v4
         with:
-          arguments: releaseVersion --no-commit
+          distribution: temurin
+          java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Bump version
+        run: ./gradlew releaseVersion --no-commit
       - name: Push changes
         run: git push --follow-tags
   build:
@@ -37,8 +38,6 @@ jobs:
           fetch-depth: 0
       - uses: ./.github/actions/output-latest-tag
         id: latest-tag
-      - name: Checkout a latest tag
-        run: git checkout ${{ steps.latest-tag.outputs.latest-tag }}
       - name: Download jar
         uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,15 +13,15 @@ jobs:
           fetch-depth: 0
       - uses: ./.github/actions/output-latest-tag
         id: latest-tag
-      - name: Checkout a latest tag
-        if: ${{ github.ref == 'refs/heads/main' }}
-        run: git checkout ${{ steps.latest-tag.outputs.latest-tag }}
-      - name: Setup Java & Gradle
-        uses: ./.github/actions/setup
-      - name: Build with Gradle
-        uses: gradle/[email protected]
+      - name: Setup Java
+        uses: actions/setup-java@v4
         with:
-          arguments: shadowJar
+          distribution: temurin
+          java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build with Gradle
+        run: ./gradlew shadowJar
       - uses: actions/upload-artifact@v4
         with:
           name: jar