diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9cbb2b681..f733f3eee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,14 +17,14 @@ jobs: token: ${{ secrets.github_token }} prefix: ${{ github.ref }} -# - run: ./gradlew build publish --stacktrace -# env: -# MAVEN_URL: ${{ secrets.MAVEN_URL }} -# MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} -# MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} -# SIGNING_KEY: ${{ secrets.SIGNING_KEY }} -# SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} -# CROWDIN_KEY: ${{ secrets.CROWDIN_KEY }} + - run: ./gradlew build publish --stacktrace + env: + MAVEN_URL: ${{ secrets.MAVEN_URL }} + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} + CROWDIN_KEY: ${{ secrets.CROWDIN_KEY }} - name: Upload artifacts uses: actions/upload-artifact@v2 diff --git a/build.gradle b/build.gradle index fac4b2732..bb80ff061 100644 --- a/build.gradle +++ b/build.gradle @@ -56,8 +56,7 @@ configurations { } def ENV = System.getenv() -def build_number = ENV.BUILD_NUMBER ?: "local" -version = "${version}+build.$build_number" + license { header file('HEADER') @@ -68,9 +67,12 @@ license { group = 'TechReborn' allprojects { - version = "5.0.0-alpha+1.16" + version = "5.0.0-alpha" + def build_number = ENV.BUILD_NUMBER ?: "local" + version = "${version}+build.$build_number" apply plugin: "fabric-loom" + apply plugin: "maven-publish" sourceCompatibility = JavaVersion.VERSION_16 targetCompatibility = JavaVersion.VERSION_16 @@ -112,7 +114,7 @@ allprojects { publications { maven(MavenPublication) { groupId project.name - artifactId project.archivesBaseName + artifactId project.archivesBaseName + "-" + getBranch() version project.version artifact(remapJar) { @@ -257,7 +259,7 @@ curseforge { id = "233564" changelog = "A changelog can be found at https://github.com/TechReborn/TechReborn" releaseType = ENV.RELEASE_CHANNEL ?: "release" - addGameVersion "1.16.5" + addGameVersion "1.17" addGameVersion "Fabric" mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) @@ -340,7 +342,7 @@ task compileRecipes { // A task to ensure that the version being released has not already been released. task checkVersion { doFirst { - def xml = new URL("https://maven.modmuss50.me/TechReborn/TechReborn-1.16/maven-metadata.xml").text + def xml = new URL("https://maven.modmuss50.me/TechReborn/TechReborn-1.17/maven-metadata.xml").text def metadata = new XmlSlurper().parseText(xml) def versions = metadata.versioning.versions.version*.text(); if (versions.contains(version)) {