publish only via github

TheNextLvl-net · Apr 30, 2024 · d5a7907 · d5a7907
1 parent a6e5eea
commit d5a7907
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,6 +10,8 @@ jobs:
   build:
     env:
       HANGAR_API_TOKEN: ${{ secrets.HANGAR_API_TOKEN }}
+      REPOSITORY_USER: ${{ secrets.REPOSITORY_USER }}
+      REPOSITORY_PASSWORD: ${{ secrets.REPOSITORY_PASSWORD }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -18,7 +20,7 @@ jobs:
         with:
           java-version: '21'
           distribution: 'temurin'
-      - name: Publish with Gradle to Hangar
+      - name: Publish with Gradle to Hangar and Repository
         uses: gradle/actions/setup-gradle@v3
         with:
-          arguments: publishAllPublicationsToHangar
+          arguments: publish publishAllPublicationsToHangar
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -42,10 +42,8 @@ publishing {
         val branch = if (version.toString().contains("-pre")) "snapshots" else "releases"
         url = uri("https://repo.thenextlvl.net/$branch")
         credentials {
-            if (extra.has("RELEASES_USER"))
-                username = extra["RELEASES_USER"].toString()
-            if (extra.has("RELEASES_PASSWORD"))
-                password = extra["RELEASES_PASSWORD"].toString()
+            username = System.getenv("REPOSITORY_USER")
+            password = System.getenv("REPOSITORY_PASSWORD")
         }
     }
 }
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -89,9 +89,7 @@ hangarPublish { // docs - https://docs.papermc.io/misc/hangar-publishing
         id.set("Worlds")
         version.set(project.version as String)
         channel.set(if (isRelease) "Release" else "Snapshot")
-        if (extra.has("HANGAR_API_TOKEN"))
-            apiKey.set(extra["HANGAR_API_TOKEN"] as String)
-        else apiKey.set(System.getenv("HANGAR_API_TOKEN"))
+        apiKey.set(System.getenv("HANGAR_API_TOKEN"))
         platforms {
             register(Platforms.PAPER) {
                 jar.set(tasks.shadowJar.flatMap { it.archiveFile })