diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index dffd281f4..000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Publish -on: [push] -jobs: - build: - runs-on: ubuntu-20.04 - container: - image: adoptopenjdk:16-jdk - options: --user root - steps: - - uses: actions/checkout@v2 - - uses: gradle/wrapper-validation-action@v1 - - - name: Generate build number - id: buildnumber - uses: einaregilsson/build-number@v3 - with: - 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 }} - CROWDIN_KEY: ${{ secrets.CROWDIN_KEY }} - - - name: Upload artifacts - uses: actions/upload-artifact@v2 - with: - name: Artifacts - path: build/libs/ \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 433ff8446..b34b4a0ca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,14 +24,7 @@ jobs: workflow_id: release.yml - uses: gradle/wrapper-validation-action@v1 - - name: Generate build number - id: buildnumber - uses: einaregilsson/build-number@v3 - with: - token: ${{ secrets.github_token }} - prefix: ${{ github.ref }} - - - run: ./gradlew build publish curseforge github --stacktrace + - run: ./gradlew checkVersion build publish curseforge github --stacktrace env: RELEASE_CHANNEL: ${{ github.event.inputs.channel }} MAVEN_URL: ${{ secrets.MAVEN_URL }} diff --git a/build.gradle b/build.gradle index 4cd0e16c3..a54a5073b 100644 --- a/build.gradle +++ b/build.gradle @@ -80,8 +80,7 @@ license { group = 'TechReborn' allprojects { - def build_number = ENV.BUILD_NUMBER ?: "local" - version = "${project.mod_version}+build.$build_number" + version = project.mod_version + (ENV.GITHUB_ACTIONS ? "" : "+local") apply plugin: "fabric-loom" apply plugin: "maven-publish" @@ -279,11 +278,7 @@ task fixTranslations(dependsOn: ['renameCrowdin']) { } } -import com.google.gson.JsonArray import groovy.util.XmlSlurper -import org.apache.commons.io.FileUtils - -import java.util.function.Consumer curseforge { if (ENV.CURSEFORGE_API_KEY) {