diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94f54ce0f..c5089b831 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,7 @@ jobs: - gametest env: CI_BUILD: true + PR_BUILD: false steps: - name: checkout uses: actions/checkout@v4 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 41899d56a..8d64614e4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -19,6 +19,7 @@ jobs: - gametest env: CI_BUILD: true + PR_BUILD: true steps: - name: checkout uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bfcce1259..40a76f1a1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,6 +8,7 @@ jobs: permissions: write-all env: CI_BUILD: false + PR_BUILD: false runs-on: ubuntu-latest steps: - name: checkout diff --git a/build.gradle b/build.gradle index 498275809..e236d5f4e 100644 --- a/build.gradle +++ b/build.gradle @@ -99,9 +99,13 @@ allprojects { // Formats the mod version to include the loader, Minecraft version, and build number (if present) String buildNumber + String buildType = 'build' if (System.getenv("CI_BUILD") == 'false') buildNumber = null - else buildNumber = System.getenv("GITHUB_RUN_NUMBER") - version = "${mod_version}" + (buildNumber != null ? "+build.${buildNumber}" : "") + else { + if (System.getenv("PR_BUILD") != 'false') buildType = 'pr' + buildNumber = System.getenv("GITHUB_RUN_NUMBER") + } + version = "${mod_version}" + (buildNumber != null ? "+${buildType}.${buildNumber}" : "") repositories { // Add repositories to retrieve artifacts from in here.