Fix CI in PRs

CyclopsMC · Apr 14, 2024 · 044ac6d · 044ac6d
1 parent 3af3043
commit 044ac6d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,6 +49,8 @@ jobs:
           SIGN_STOREPASS: ${{ secrets.SIGN_STOREPASS }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_KEY: ${{ secrets.MAVEN_KEY }}
+          GITHUB_USER: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: 'Test'
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

diff --git a/build.gradle b/build.gradle
@@ -58,8 +58,8 @@ repositories {
         name "Cyclops Repo"
         url "https://maven.pkg.github.com/CyclopsMC/packages"
         credentials {
-            username = project.findProperty("gpr.user") ?: System.getenv("MAVEN_USERNAME")
-            password = project.findProperty("gpr.key") ?: System.getenv("MAVEN_KEY")
+            username = project.findProperty("gpr.user") ?: System.getenv("MAVEN_USERNAME") ?: System.getenv("GITHUB_USER")
+            password = project.findProperty("gpr.key") ?: System.getenv("MAVEN_KEY") ?: System.getenv("GITHUB_TOKEN")
         }
     }
 }
@@ -201,6 +201,8 @@ task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge)
     }
 	mainFile.addGameVersion(project.minecraft_version)
 	mainFile.addModLoader("NeoForge")
+
+	mainFile.addRequirement('cyclops-core')
 }
 
 modrinth {

diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,7 @@
 pluginManagement {
     repositories {
         mavenLocal()
-		gradlePluginPortal()
+        gradlePluginPortal()
         maven { url = 'https://maven.neoforged.net/releases' }
     }
 }