Use properties for CI

RakambdaOrg · Jul 21, 2023 · 0e58369 · 0e58369
1 parent 4afd85c
commit 0e58369
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 72 deletions.
diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml
@@ -33,11 +33,11 @@ jobs:
           arguments: |
             clean
             build
-            -DforgeKeyStore="keystoreForgeMods.jks"
-            -DforgeKeyStoreAlias="${{ secrets.KEYSTORE_FORGE_MODS_ALIAS }}"
-            -DforgeKeyStorePass="${{ secrets.KEYSTORE_FORGE_MODS_STORE_PASS }}"
-            -DforgeKeyStoreKeyPass="${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }}"
-            -DforgeSignSHA1="f927f4701bf4c0620c7bd0a501ce278f5e5ecc62"
+            -PforgeKeyStore="keystoreForgeMods.jks"
+            -PforgeKeyStoreAlias="${{ secrets.KEYSTORE_FORGE_MODS_ALIAS }}"
+            -PforgeKeyStorePass="${{ secrets.KEYSTORE_FORGE_MODS_STORE_PASS }}"
+            -PforgeKeyStoreKeyPass="${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }}"
+            -PforgeSignSHA1="f927f4701bf4c0620c7bd0a501ce278f5e5ecc62"
 
       - name: Upload mod file
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/gradle_publish.yml b/.github/workflows/gradle_publish.yml
@@ -38,13 +38,13 @@ jobs:
           arguments: |
             clean
             build
-            -Dversion=${{ steps.get_release.outputs.name }}
-            -Dchangelog="[Changelog at ${{ steps.get_release.outputs.html_url }}](${{ steps.get_release.outputs.html_url }})\n\n${{ steps.get_release.outputs.body }}"
-            -DforgeKeyStore=keystoreForgeMods.jks
-            -DforgeKeyStoreAlias=${{ secrets.KEYSTORE_FORGE_MODS_ALIAS }}
-            -DforgeKeyStorePass=${{ secrets.KEYSTORE_FORGE_MODS_STORE_PASS }}
-            -DforgeKeyStoreKeyPass=${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }}
-            -DforgeSignSHA1=f927f4701bf4c0620c7bd0a501ce278f5e5ecc62
+            -Pversion=${{ steps.get_release.outputs.name }}
+            -Pchangelog="[Changelog at ${{ steps.get_release.outputs.html_url }}](${{ steps.get_release.outputs.html_url }})\n\n${{ steps.get_release.outputs.body }}"
+            -PforgeKeyStore=keystoreForgeMods.jks
+            -PforgeKeyStoreAlias=${{ secrets.KEYSTORE_FORGE_MODS_ALIAS }}
+            -PforgeKeyStorePass=${{ secrets.KEYSTORE_FORGE_MODS_STORE_PASS }}
+            -PforgeKeyStoreKeyPass=${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }}
+            -PforgeSignSHA1=f927f4701bf4c0620c7bd0a501ce278f5e5ecc62
 
       - name: Push on stores
         uses: gradle/[email protected]
@@ -54,15 +54,15 @@ jobs:
             curseforge
             modrinth
             modrinthSyncBody
-            -Dversion=${{ steps.get_release.outputs.name }}
-            -Dchangelog="[Changelog at ${{ steps.get_release.outputs.html_url }}](${{ steps.get_release.outputs.html_url }})\n\n${{ steps.get_release.outputs.body }}"
-            -DcurseforgeApiKey=${{ secrets.CURSEFORGE_API_KEY }}
-            -DmodrinthToken=${{ secrets.MODRINTH_TOKEN }}
-            -DforgeKeyStore=keystoreForgeMods.jks
-            -DforgeKeyStoreAlias=${{ secrets.KEYSTORE_FORGE_MODS_ALIAS }}
-            -DforgeKeyStorePass=${{ secrets.KEYSTORE_FORGE_MODS_STORE_PASS }}
-            -DforgeKeyStoreKeyPass=${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }}
-            -DforgeSignSHA1=f927f4701bf4c0620c7bd0a501ce278f5e5ecc62
+            -Pversion=${{ steps.get_release.outputs.name }}
+            -Pchangelog="[Changelog at ${{ steps.get_release.outputs.html_url }}](${{ steps.get_release.outputs.html_url }})\n\n${{ steps.get_release.outputs.body }}"
+            -PcurseforgeApiKey=${{ secrets.CURSEFORGE_API_KEY }}
+            -PmodrinthToken=${{ secrets.MODRINTH_TOKEN }}
+            -PforgeKeyStore=keystoreForgeMods.jks
+            -PforgeKeyStoreAlias=${{ secrets.KEYSTORE_FORGE_MODS_ALIAS }}
+            -PforgeKeyStorePass=${{ secrets.KEYSTORE_FORGE_MODS_STORE_PASS }}
+            -PforgeKeyStoreKeyPass=${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }}
+            -PforgeSignSHA1=f927f4701bf4c0620c7bd0a501ce278f5e5ecc62
 
       - name: Push changes to the wiki
         uses: Andrew-Chen-Wang/github-wiki-action@v4

diff --git a/.github/workflows/gradle_test.yml b/.github/workflows/gradle_test.yml
diff --git a/build.gradle b/build.gradle
@@ -133,17 +133,6 @@ static def extractMainVersion(String ver) {
     return null;
 }
 
-tasks.create("displayVars"){
-    def ck = project.findProperty("curseforgeApiKey")
-    def mk = project.findProperty("modrinthToken")
-    def c = project.findProperty("changelog")
-    def v = project.version
-    println("CK: ${ck}")
-    println("MK: ${mk}")
-    println("C: ${c}")
-    println("V: ${v}")
-}
-
 curseforge {
     apiKey = "${project.findProperty("curseforgeApiKey")}"
     project {