diff --git a/.github/workflows/build-prs.yml b/.github/workflows/build-prs.yml new file mode 100644 index 0000000..3c7c287 --- /dev/null +++ b/.github/workflows/build-prs.yml @@ -0,0 +1,23 @@ +# File generated by the GradleUtils `setupGitHubActionsWorkflows` task, avoid modifying it directly +# The template can be found at https://github.com/neoforged/GradleUtils/blob/44d9e09cfa2c6032b84ac40495ea5ab7d64fe521/src/actionsTemplate/resources/.github/workflows/build-prs.yml + +name: Build and test PRs + +on: + pull_request: + types: + - synchronize + - opened + - ready_for_review + - reopened + push: + branches: + - 'feature/**' + workflow_dispatch: + +jobs: + build: + uses: neoforged/actions/.github/workflows/build-prs.yml@main + with: + java: 17 + gradle_tasks: test \ No newline at end of file diff --git a/.github/workflows/publish-prs.yml b/.github/workflows/publish-prs.yml new file mode 100644 index 0000000..a286e97 --- /dev/null +++ b/.github/workflows/publish-prs.yml @@ -0,0 +1,29 @@ +# File generated by the GradleUtils `setupGitHubActionsWorkflows` task, avoid modifying it directly +# The template can be found at https://github.com/neoforged/GradleUtils/blob/44d9e09cfa2c6032b84ac40495ea5ab7d64fe521/src/actionsTemplate/resources/.github/workflows/publish-prs.yml + +name: Publish PRs to GitHub Packages + +on: + workflow_run: + workflows: [Build and test PRs] + types: + - completed + issue_comment: + types: + - edited + pull_request_target: + types: + - opened + +permissions: + packages: write + +jobs: + publish-prs: + if: false # Option not enabled when the workflows were generated + uses: neoforged/actions/.github/workflows/publish-prs.yml@main + with: + artifact_base_path: dev/su5ed/sinytra/adapter/adapter/ + secrets: + PR_PUBLISHING_GH_APP_ID: ${{ secrets.PR_PUBLISHING_GH_APP_ID }} + PR_PUBLISHING_GH_APP_KEY: ${{ secrets.PR_PUBLISHING_GH_APP_KEY }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..9a3b3f2 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,24 @@ +# File generated by the GradleUtils `setupGitHubActionsWorkflows` task, avoid modifying it directly +# The template can be found at https://github.com/neoforged/GradleUtils/blob/44d9e09cfa2c6032b84ac40495ea5ab7d64fe521/src/actionsTemplate/resources/.github/workflows/release.yml + +name: Release + +on: + push: + branches: [ "master" ] + +permissions: + contents: read + statuses: write + +jobs: + release: + uses: neoforged/actions/.github/workflows/gradle-publish.yml@main + with: + java: 17 + pre_gradle_tasks: test + gradle_tasks: publish + secrets: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + MAVEN_USER: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} diff --git a/build.gradle.kts b/build.gradle.kts index fe0817b..5f35353 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ base { archivesName.set(project.name.lowercase()) } -println("Project version: $version") +println("Data version: $version") java { toolchain { @@ -66,4 +66,4 @@ publishing { } } } -} \ No newline at end of file +} diff --git a/definition/build.gradle.kts b/definition/build.gradle.kts index c5ab6ce..09ae490 100644 --- a/definition/build.gradle.kts +++ b/definition/build.gradle.kts @@ -1,10 +1,18 @@ plugins { `java-library` `maven-publish` + id("net.neoforged.gradleutils").version("3.0.0-alpha.10") } group = "dev.su5ed.sinytra.adapter" -version = "1.10.5" +gradleutils.version { + branches { + suffixBranch() + } +} + +version = gradleutils.version +println("Definition version: $version") java { toolchain { @@ -69,9 +77,9 @@ publishing { name = "Su5eD" url = uri("https://maven.su5ed.dev/releases") credentials { - username = System.getenv("MAVEN_USERNAME") ?: "not" + username = System.getenv("MAVEN_USER") ?: "not" password = System.getenv("MAVEN_PASSWORD") ?: "set" } } } -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 62f495d..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME