diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 773bcd4..4cd8c23 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Get Release Info id: release-info - uses: GeyserMC/actions/previous-release@feature/globs + uses: GeyserMC/actions/previous-release@master with: data: ${{ vars.RELEASEACTION_PREVRELEASE }} @@ -34,11 +34,11 @@ jobs: BUILD_NUMBER: ${{ steps.release-info.outputs.curentRelease }} - name: Archive Artifacts - uses: GeyserMC/actions/upload-multi-artifact@feature/globs + uses: GeyserMC/actions/upload-multi-artifact@master if: success() with: artifacts: | - rainbow:build/libs/rainbow-*.jar + rainbow:build/libs/rainbow.jar - name: Get Version if: ${{ (success() || failure()) && github.repository == 'GeyserMC/Rainbow' }} @@ -49,28 +49,28 @@ jobs: - name: Get Release Metadata if: ${{ (success() || failure()) && github.repository == 'GeyserMC/Rainbow' }} - uses: GeyserMC/actions/release@feature/globs + uses: GeyserMC/actions/release@master id: metadata with: appID: ${{ secrets.RELEASE_APP_ID }} appPrivateKey: ${{ secrets.RELEASE_APP_PK }} files: | - rainbow:build/libs/rainbow-*.jar - releaseEnabled: true + rainbow:build/libs/rainbow.jar + releaseEnabled: false saveMetadata: true releaseProject: 'rainbow' releaseVersion: ${{ steps.get-version.outputs.VERSION }} -# - name: Publish to Downloads API -# if: ${{ success() && github.repository == 'GeyserMC/Rainbow' && github.ref_name == 'master' }} -# uses: GeyserMC/actions/upload-release@feature/globs -# with: -# username: ${{ vars.DOWNLOADS_USERNAME }} -# privateKey: ${{ secrets.DOWNLOADS_PRIVATE_KEY }} -# host: ${{ secrets.DOWNLOADS_SERVER_IP }} -# files: | -# build/libs/rainbow-*.jar - TODO does not support globs! -# changelog: ${{ steps.metadata.outputs.body }} + - name: Publish to Downloads API + if: ${{ success() && github.repository == 'GeyserMC/Rainbow' && github.ref_name == 'master' }} + uses: GeyserMC/actions/upload-release@master + with: + username: ${{ vars.DOWNLOADS_USERNAME }} + privateKey: ${{ secrets.DOWNLOADS_PRIVATE_KEY }} + host: ${{ secrets.DOWNLOADS_SERVER_IP }} + files: | + build/libs/rainbow.jar + changelog: ${{ steps.metadata.outputs.body }} # - name: Publish to Modrinth # if: ${{ success() && github.repository == 'GeyserMC/rainbow' && github.ref_name == 'master' }} @@ -87,4 +87,4 @@ jobs: discordWebhook: ${{ secrets.DISCORD_WEBHOOK }} status: ${{ job.status }} body: ${{ steps.metadata.outputs.body }} - includeDownloads: false + includeDownloads: true diff --git a/build.gradle b/build.gradle index 3f26383..3912291 100644 --- a/build.gradle +++ b/build.gradle @@ -3,14 +3,6 @@ plugins { id 'maven-publish' } -version = project.mod_version -group = project.maven_group - -base { - archivesName = project.archives_base_name -} - - repositories { maven { url = "https://maven.parchmentmc.org" @@ -30,13 +22,13 @@ dependencies { } processResources { - inputs.property "version", project.version + inputs.property "version", project.mod_version inputs.property "supported_versions", project.supported_versions inputs.property "loader_version", project.loader_version filteringCharset "UTF-8" filesMatching("fabric.mod.json") { - expand "version": project.version, + expand "version": project.mod_version, "supported_versions": project.supported_versions, "loader_version": project.loader_version } @@ -55,7 +47,7 @@ java { if (JavaVersion.current() < javaVersion) { toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) } - //withSourcesJar() + withSourcesJar() } jar {