From d6dfbf03c4d0255ed072cc129e23c22cf6529ba1 Mon Sep 17 00:00:00 2001 From: Cadiboo <37298044+Cadiboo@users.noreply.github.com> Date: Fri, 14 Jun 2024 23:51:27 +1000 Subject: [PATCH] Fix publishing [ci publish] --- .github/workflows/build.yml | 52 +++++++++++++++++++++---------------- build.gradle | 4 +-- common/build.gradle | 2 +- fabric/build.gradle | 2 +- forge/build.gradle | 2 +- gradle.properties | 2 +- 6 files changed, 36 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22697d87..74936046 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,14 @@ name: Build -on: [push, workflow_dispatch] +on: + push: + tags-ignore: + - * + workflow_dispatch: {} jobs: build-fabric: runs-on: ubuntu-latest + permissions: + contents: write steps: - name: Checkout uses: actions/checkout@v4 @@ -13,23 +19,23 @@ 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) + - name: Integration tests run: ./gradlew :fabric:runGameTestServer --stacktrace - name: Publish uses: Kir-Antipov/mc-publish@v3.3 @@ -39,12 +45,12 @@ jobs: files: fabric/build/libs/*.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 }} + 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-forge: runs-on: ubuntu-latest steps: @@ -57,9 +63,9 @@ jobs: java-version: 17 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 - - name: Build and check (forge) + - name: Build and check run: ./gradlew :forge:build --stacktrace - - name: Archive development jars (forge) + - name: Archive development jars uses: actions/upload-artifact@v4 with: name: Development jars inside (forge) @@ -68,7 +74,7 @@ jobs: forge/build/libs/*-sources.jar forge/build/libs/*-javadoc.jar if-no-files-found: error - - name: Archive playable jar (forge) + - name: Archive playable jar uses: actions/upload-artifact@v4 with: name: Playable mod jar inside (forge) @@ -78,19 +84,21 @@ jobs: !forge/build/libs/*-sources.jar !forge/build/libs/*-javadoc.jar if-no-files-found: error - - name: Integration tests (forge) + - name: Integration tests run: ./gradlew :forge:runGameTestServer --stacktrace + - name: Debug + run: echo "${{ env.GITHUB_SHA }}" - 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 + files: forge/build/libs/!(*-@(sources|dev|dev-shadow|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-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" diff --git a/build.gradle b/build.gradle index a8d898b4..374d350f 100644 --- a/build.gradle +++ b/build.gradle @@ -14,8 +14,8 @@ String execCmd(List 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 { diff --git a/common/build.gradle b/common/build.gradle index 19b3c13a..5d2b9d93 100644 --- a/common/build.gradle +++ b/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) diff --git a/fabric/build.gradle b/fabric/build.gradle index 7b1b19af..c46aa9c3 100644 --- a/fabric/build.gradle +++ b/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}" diff --git a/forge/build.gradle b/forge/build.gradle index 77a59191..d492c6ba 100644 --- a/forge/build.gradle +++ b/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") diff --git a/gradle.properties b/gradle.properties index 1c5dd861..cacb255e 100644 --- a/gradle.properties +++ b/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