Fix publishing

[ci publish]

.github/workflows/build.yml

@@ -1,8 +1,13 @@
 name: Build
-on: [push, workflow_dispatch]
+on:
+  push:
+    branches: ['*']
+  workflow_dispatch: {}
 jobs:
   build-fabric:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -13,84 +18,35 @@ jobs:
           java-version: 17
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
-      - name: Build and check (fabric)
+      - name: Build and check
         run: ./gradlew :fabric:build --stacktrace
-      - name: Archive development jars (fabric)
+      - name: Archive development jars
         uses: actions/upload-artifact@v4
         with:
           name: Development jars inside (fabric)
           path: |
             fabric/build/devlibs/*.jar
           if-no-files-found: error
-      - name: Archive playable jar (fabric)
+      - name: Archive playable jar
         uses: actions/upload-artifact@v4
         with:
           name: Playable mod jar inside (fabric)
           path: |
             fabric/build/libs/*.jar
           if-no-files-found: error
-      - name: Integration tests (forge)
-        run: ./gradlew :fabric:runGameTestServer --stacktrace
+#      - name: Integration tests
+#        run: ./gradlew :fabric:runGameTestServer --stacktrace
       - name: Publish
         uses: Kir-Antipov/mc-publish@v3.3
         if: "contains(github.event.head_commit.message, '[ci publish]')"
         with:
           version-type: beta
-          files: fabric/build/libs/*.jar
+          files: fabric/build/libs/!(*-@(sources|dev|dev-shadow|javadoc).jar)
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          github-commitish: ${{ env.GITHUB_SHA }}
-          github-files-primary: fabric/build/libs/*.jar
-          github-files-secondary: fabric/build/devlibs/*.jar
-          curseforge-id: 309664
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-          modrinth-id: w3bbwFYU
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-  build-forge:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 17
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-      - name: Build and check (forge)
-        run: ./gradlew :forge:build --stacktrace
-      - name: Archive development jars (forge)
-        uses: actions/upload-artifact@v4
-        with:
-          name: Development jars inside (forge)
-          path: |
-            forge/build/libs/*-dev.jar
-            forge/build/libs/*-sources.jar
-            forge/build/libs/*-javadoc.jar
-          if-no-files-found: error
-      - name: Archive playable jar (forge)
-        uses: actions/upload-artifact@v4
-        with:
-          name: Playable mod jar inside (forge)
-          path: |
-            forge/build/libs/*.jar
-            !forge/build/libs/*-dev.jar
-            !forge/build/libs/*-sources.jar
-            !forge/build/libs/*-javadoc.jar
-          if-no-files-found: error
-      - name: Integration tests (forge)
-        run: ./gradlew :forge:runGameTestServer --stacktrace
-      - name: Publish
-        uses: Kir-Antipov/mc-publish@v3.3
-        if: "contains(github.event.head_commit.message, '[ci publish]')"
-        with:
-          version-type: beta
-          files: forge/build/libs/!(*-@(dev|sources|javadoc)).jar
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          github-commitish: ${{ env.GITHUB_SHA }}
-          github-files-primary: forge/build/libs/!(*-@(dev|sources|javadoc)).jar
-          github-files-secondary: forge/build/libs/*-@(dev|sources|javadoc).jar
-          curseforge-id: 309664
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-          modrinth-id: w3bbwFYU
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          github-commitish: ${{ github.sha }}
+          github-generate-changelog: true
+          changelog: https://github.com/Cadiboo/NoCubes/releases
+#          curseforge-id: 309664
+#          curseforge-token: "secrets.CURSEFORGE_TOKEN"
+#          modrinth-id: w3bbwFYU
+#          modrinth-token: "secrets.MODRINTH_TOKEN"

build.gradle

@@ -14,8 +14,8 @@ String execCmd(List<String> params, String fallback) {
 	return result.getExitValue() != 0 ? fallback : stdout.toString().trim()
 }
 
-// We use the version format MAJOR.MINOR.PATCH-COMMIT
-version = "${mod_version}-${execCmd(['git', 'rev-parse', '--short', 'HEAD'], 'nogit')}"
+// We use the version format MCVERSION-MAJOR.MINOR.PATCH-COMMIT
+version = "${minecraft_version}-${mod_version}-${execCmd(['git', 'rev-parse', '--short', 'HEAD'], 'nogit')}"
 group = mod_group
 
 ext {

common/build.gradle

@@ -5,7 +5,7 @@ plugins {
 	id 'org.spongepowered.gradle.vanilla'
 }
 base {
-	archivesName = "${mod_name}-common-${minecraft_version}"
+	archivesName = "${mod_name}-common"
 }
 minecraft {
 	version(minecraft_version)

fabric/build.gradle

@@ -7,7 +7,7 @@ plugins {
 	id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 base {
-	archivesName = "${mod_name}-fabric-${minecraft_version}"
+	archivesName = "${mod_name}-fabric"
 }
 dependencies {
 	minecraft "com.mojang:minecraft:${minecraft_version}"

forge/build.gradle

@@ -7,7 +7,7 @@ plugins {
 	id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 base {
-	archivesName = "${mod_name}-forge-${minecraft_version}"
+	archivesName = "${mod_name}-forge"
 }
 mixin {
 	add(sourceSets.main, "${mod_id}.refmap.json")

gradle.properties

@@ -5,7 +5,7 @@ minecraft_version=1.20.1
 forge_version=47.2.30
 forge_loader_version_range=[47,)
 forge_version_range=[47,)
-minecraft_version_range=[1.20.1, 1.21)
+minecraft_version_range=[1.20.1,)
 
 # Fabric
 fabric_loader_version=0.15.10