From ce4a94f4f6a3be955bd0388ca18503234fdd6020 Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Tue, 30 Nov 2021 10:25:34 +0100 Subject: [PATCH] Update build script and CI --- .github/workflows/release-latest.yml | 44 ---------------------------- .gitignore | 1 - build.gradle | 29 +++++++----------- 3 files changed, 11 insertions(+), 63 deletions(-) delete mode 100644 .github/workflows/release-latest.yml diff --git a/.github/workflows/release-latest.yml b/.github/workflows/release-latest.yml deleted file mode 100644 index 5ecccc04..00000000 --- a/.github/workflows/release-latest.yml +++ /dev/null @@ -1,44 +0,0 @@ -# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle - -name: Release latest build - -on: - push: - branches: [ master, main ] - -jobs: - build-and-release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Set release version - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - - name: Set up JDK 8 - uses: actions/setup-java@v2 - with: - java-version: '8' - distribution: 'adopt' - cache: gradle - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Setup the workspace - run: ./gradlew setupCIWorkspace - - - name: Build the mod - run: ./gradlew build - - - name: Update latest tag - uses: "marvinpinto/action-automatic-releases@latest" - with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "latest" - prerelease: false - title: "Latest build" - files: build/libs/*.jar diff --git a/.gitignore b/.gitignore index 40fb5e4a..558ad12d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,3 @@ whitelist.json *.ipr *.iws src/main/resources/mixins.*.json -*.bat diff --git a/build.gradle b/build.gradle index 3e425e62..a380f6c7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: a553e159ecaf0fc236cf25b2c124ea90f92bb140 +//version: ffe7b130f98fdfa1ac7c6ba4bd34722a55ab28d4 /* DO NOT CHANGE THIS FILE! @@ -62,6 +62,10 @@ idea { } } +if(JavaVersion.current() != JavaVersion.VERSION_1_8) { + throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current()) +} + checkPropertyExists("modName") checkPropertyExists("modId") checkPropertyExists("modGroup") @@ -153,7 +157,12 @@ configurations.all { // Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version 'git config core.fileMode false'.execute() // Pulls version from git tag -version = minecraftVersion + "-" + gitVersion() +try { + version = minecraftVersion + "-" + gitVersion() +} +catch (Exception e) { + throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag!"); +} group = modGroup archivesBaseName = modId @@ -451,22 +460,6 @@ artifacts { } } -// Crude handler to append custom maven repositories to maven dependency -install{ - repositories{ - mavenInstaller{ - pom.withXml { - def repositoriesNode = asNode().appendNode("repositories") - project.repositories.each { repository -> - def repositoryNode = repositoriesNode.appendNode("repository") - repositoryNode.appendNode("name", repository.name) - repositoryNode.appendNode("url", repository.properties.get("url")) - } - } - } - } -} - // Updating task updateBuildScript { doLast {