Merge branch '1.20' of https://github.com/Low-Drag-MC/Shimmer into 1.20

Low-Drag-MC · Dec 4, 2023 · d513c3d · d513c3d
2 parents c2ddf7e + 3e5bd34
commit d513c3d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,9 +8,6 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    env:
-      MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
-      MAVEN_USER: ${{ secrets.MAVEN_USER }}
 
     steps:
     - uses: actions/checkout@v3
@@ -32,11 +29,6 @@ jobs:
       with:
         arguments: build
 
-    - name: Publish to Maven
-      uses: gradle/gradle-build-action@v2.4.2
-      with:
-        arguments: publish
-
     - name: Upload Jars
       uses: actions/upload-artifact@v3.1.2
       with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,6 +16,11 @@ on:
         description: "change log"
         required: true
         type: string
+      maven-repository:
+        description: "maven repository"
+        required: true
+        type: boolean
+        default: true
       github-release:
         description: "publish github release"
         type: boolean
@@ -44,6 +49,34 @@ jobs:
       contents: read
     uses: "./.github/workflows/build.yml"
 
+  upload-maven:
+    needs: call-build-workflow
+    runs-on: ubuntu-latest
+    if: inputs.maven-repository
+    env:
+      MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+      MAVEN_USER: ${{ secrets.MAVEN_USER }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Download shimmer artifact
+        uses: actions/download-artifact@v3
+        continue-on-error: true
+        with:
+          name: Shimmer
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: Grant execute permission for gradle
+        run: chmod +x gradlew
+      - name: Publish to Maven
+        uses: gradle/gradle-build-action@v2.4.2
+        with:
+          arguments: publish
+
   publish:
     needs: call-build-workflow
     runs-on: ubuntu-latest
@@ -130,4 +163,4 @@ jobs:
           java: Java 18
 
           curseforge-id: 627824
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}