diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22697d87..59a00d4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,23 +13,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 @@ -37,14 +37,11 @@ jobs: with: version-type: beta 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-token: ${{ secrets.RELEASES_GITHUB_TOKEN }} +# 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 +54,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 +65,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 +75,16 @@ 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: 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 }} + files: forge/build/libs/!(*-@(sources|dev|dev-shadow|javadoc).jar) + github-token: ${{ secrets.RELEASES_GITHUB_TOKEN }} +# curseforge-id: 309664 +# curseforge-token: "secrets.CURSEFORGE_TOKEN" +# modrinth-id: w3bbwFYU +# modrinth-token: "secrets.MODRINTH_TOKEN" 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