Fix release action

lukebemishprojects · Dec 16, 2023 · 78caf20 · 78caf20
1 parent 3ebce14
commit 78caf20
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,9 +37,9 @@
                     "uses": "fregante/setup-git-user@v2"
                 },
                 {
-                    "name": "tagRelease",
-                    "run": "./gradlew ",
-                    "id": "tagrelease",
+                    "name": "Tag Release",
+                    "run": "./gradlew tagRelease",
+                    "id": "tag_release",
                     "env": {
                         "RELEASE_MAVEN_PASSWORD": "${{ secrets.RELEASE_MAVEN_PASSWORD }}",
                         "RELEASE_MAVEN_USER": "github",
@@ -60,6 +60,9 @@
                         "MODRINTH_KEY": "${{ secrets.MODRINTH_KEY }}"
                     }
                 },
+                {
+                    "run": "git push && git push --tags"
+                },
                 {
                     "with": {
                         "args": "copy build/prepareJavadoc r2:javadoc-lukebemish-dev"
@@ -87,9 +90,6 @@
                         "CURSEFORGE_KEY": "${{ secrets.CURSEFORGE_KEY }}",
                         "MODRINTH_KEY": "${{ secrets.MODRINTH_KEY }}"
                     }
-                },
-                {
-                    "run": "git push && git push --tags"
                 }
             ]
         }

diff --git a/build.gradle b/build.gradle
@@ -31,9 +31,12 @@ managedVersioning {
                 step {
                     setupGitUser()
                 }
-                gradlew 'tagRelease'
-                gradlew 'Build', 'checkLicenses', 'build', 'prepareJavadoc'
                 readOnly.set false
+                gradlew 'Tag Release', 'tagRelease'
+                gradlew 'Build', 'checkLicenses', 'build', 'prepareJavadoc'
+                step {
+                    run.set 'git push && git push --tags'
+                }
                 step {
                     name.set 'Upload Javadoc'
                     uses.set 'andreiio/rclone-action@v1.2.0'
@@ -49,9 +52,6 @@ managedVersioning {
                 gradlew 'Publish', 'publish', 'modrinth', 'curseforge'
                 mavenRelease('github')
                 modPublishing()
-                step {
-                    run.set 'git push && git push --tags'
-                }
             }
         }
         build_pr {