update CI

PssbleTrngle · Jun 3, 2023 · 8503071 · 8503071
1 parent 31b928e
commit 8503071
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,14 +37,13 @@ jobs:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
           CHANGELOG: ${{ github.event.release.body }}
+          CI: true
 
       - name: Upload to github releases
         if: ${{ github.event_name == 'release' }}
-        uses: actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: svenstaro/upload-release-action@v2
         with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: build/libs/sliceanddice-forge-${{ github.event.release.tag_name }}.jar
+          file: build/libs/sliceanddice-forge-${{ github.event.release.tag_name }}.jar
           asset_name: sliceanddice-forge-${{ github.event.release.tag_name }}.jar
+          upload_url: ${{ github.event.release.upload_url }}
           asset_content_type: application/java-archive
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,4 @@
-import com.modrinth.minotaur.TaskModrinthSyncBody
+
 import net.darkhax.curseforgegradle.TaskPublishCurseForge
 import org.spongepowered.asm.gradle.plugins.MixinExtension
 import java.time.LocalDateTime
@@ -68,7 +68,6 @@ base {
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
-        languageVersion.set(JavaLanguageVersion.of(17))
     }
     withSourcesJar()
     withJavadocJar()
@@ -224,7 +223,7 @@ tasks.withType<Jar> {
     }
 }
 
-tasks.jar {
+tasks.withType<Jar> {
     finalizedBy("reobfJar")
 }
 
@@ -300,7 +299,6 @@ env["MODRINTH_TOKEN"]?.let { modrinthToken ->
         loaders.set(listOf("forge"))
         versionType.set(release_type)
         uploadFile.set(tasks.jar.get())
-        syncBodyFrom.set(project.file("README.md").readText())
         dependencies {
             required.project("ordsPcFz")
             required.project("LNytGWDc")
@@ -309,10 +307,6 @@ env["MODRINTH_TOKEN"]?.let { modrinthToken ->
     }
 }
 
-tasks.named("modrinth") {
-    dependsOn(tasks.withType<TaskModrinthSyncBody>())
-}
-
 sonarqube {
     properties {
         property("sonar.projectVersion", mod_version)