diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000000..60f81b3af3 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,29 @@ +name: Publish + +on: + push: + branches: [ '1.12.x' ] + +permissions: + contents: read + +jobs: + build: + uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main + with: + java: 8 + gradle_tasks: 'ciWriteBuildNumber setup build publish' + # We don't know the version number, because its in old format. So disable updating the website + # artifact_name: 'forge' + secrets: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }} + PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }} + PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }} + MAVEN_USER: ${{ secrets.MAVEN_USER }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + # Unused for now until we upgrade gradle + # SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }} + # SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }} + # SIGN_KEYSTORE_PASSWORD: ${{ secrets.SIGN_KEYSTORE_PASSWORD }} + # SIGN_KEYSTORE_DATA: ${{ secrets.SIGN_KEYSTORE_DATA }} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a4e9a10d6b..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -sudo: required -dist: trusty - -language: java -jdk: oraclejdk8 - -env: - - BUILD_NUMBER=9999 - -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ - - rm -f $HOME/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar - - rm -f $HOME/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ - - $TRAVIS_BUILD_DIR/build/localCache/Forge/ - -before_install: chmod +x gradlew -install: - - ./gradlew --refresh-dependencies - - ./gradlew ciWriteBuildNumber -script: - - travis_wait ./gradlew build -x createExe -S - - ./gradlew -p projects/Forge test -S -i - -notifications: - email: false diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 9b1e03a7ac..0000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,118 +0,0 @@ -@Library('forge-shared-library')_ - -pipeline { - options { - disableConcurrentBuilds() - } - agent { - docker { - image 'gradle:jdk8' - args '-v forgegc:/home/gradle/.gradle/' - } - } - environment { - GRADLE_ARGS = '--no-daemon --console=plain' // No daemon for now as FG3 kinda derps. //'-Dorg.gradle.daemon.idletimeout=5000' - DISCORD_WEBHOOK = credentials('forge-discord-jenkins-webhook') - DISCORD_PREFIX = "Job: Forge Branch: ${BRANCH_NAME} Build: #${BUILD_NUMBER}" - JENKINS_HEAD = 'https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png' - } - - stages { - stage('notify_start') { - when { - not { - changeRequest() - } - } - steps { - discordSend( - title: "${DISCORD_PREFIX} Started", - successful: true, - result: 'ABORTED', //White border - thumbnail: JENKINS_HEAD, - webhookURL: DISCORD_WEBHOOK - ) - } - } - stage('ciWriteBuildNumber') { - steps { - sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue ciWriteBuildNumber' - script { - env.MYGROUP = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "group:" | awk \'{print $2}\'').trim() - env.MYARTIFACT = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "name:" | awk \'{print $2}\'').trim() - env.MYVERSION = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "version:" | awk \'{print $2}\'').trim() - } - } - } - stage('setup') { - steps { - sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue setup' - } - } - stage('changelog') { - when { - not { - changeRequest() - } - } - steps { - writeChangelog(currentBuild, 'build/changelog.txt') - } - } - stage('publish') { - when { - not { - changeRequest() - } - } - environment { - FORGE_MAVEN = credentials('forge-maven-forge-user') - CROWDIN = credentials('forge-crowdin') - KEYSTORE = credentials('forge-jenkins-keystore-old') - KEYSTORE_KEYPASS = credentials('forge-jenkins-keystore-old-keypass') - KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass') - } - steps { - withCredentials([usernamePassword(credentialsId: 'maven-forge-user', usernameVariable: 'MAVEN_USER', passwordVariable: 'MAVEN_PASSWORD')]) { - withGradle { - sh './gradlew ${GRADLE_ARGS} :forge:publish -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}' - } - } - } - post { - success { - build job: 'filegenerator', parameters: [string(name: 'COMMAND', value: "promote net.minecraftforge:forge ${env.MYVERSION} latest")], propagate: false, wait: false - } - } - } - stage('test_publish_pr') { //Publish to local repo to test full process, but don't include credentials so it can't sign/publish to maven - when { - changeRequest() - } - environment { - CROWDIN = credentials('forge-crowdin') - } - steps { - sh './gradlew ${GRADLE_ARGS} :forge:publish -PcrowdinKey=${CROWDIN}' - } - } - } - post { - always { - script { - archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true, onlyIfSuccessful: true, allowEmptyArchive: true - - if (env.CHANGE_ID == null) { // This is unset for non-PRs - discordSend( - title: "${DISCORD_PREFIX} Finished ${currentBuild.currentResult}", - description: '```\n' + getChanges(currentBuild) + '\n```', - successful: currentBuild.resultIsBetterOrEqualTo("SUCCESS"), - result: currentBuild.currentResult, - thumbnail: JENKINS_HEAD, - webhookURL: DISCORD_WEBHOOK - ) - } - } - } - } -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5067736f21..e89fc4488c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:3.+' + classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.197' + classpath 'net.minecraftforge.gradleutils:GradleUtils:1.0.24' classpath 'org.ow2.asm:asm:7.1' classpath 'org.ow2.asm:asm-tree:7.1' classpath 'com.github.jponge:lzma-java:1.3' //Needed to compress deobf data @@ -37,6 +38,7 @@ import net.minecraftforge.gradle.patcher.task.ApplyBinPatches import net.minecraftforge.gradle.patcher.task.GenerateBinPatches import net.minecraftforge.gradle.patcher.task.TaskReobfuscateJar import net.minecraftforge.gradle.userdev.tasks.RenameJar +import net.minecraftforge.gradleutils.ChangelogUtils import org.apache.tools.ant.filters.ReplaceTokens import de.undercouch.gradle.tasks.download.Download import org.gradle.plugins.ide.eclipse.model.SourceFolder @@ -44,7 +46,7 @@ import org.objectweb.asm.ClassReader plugins { id 'net.minecrell.licenser' version '0.4' - id 'org.ajoberstar.grgit' version '3.1.1' + id 'org.ajoberstar.grgit' version '4.1.1' id 'de.undercouch.download' version '3.3.0' id 'com.github.ben-manes.versions' version '0.22.0' } @@ -78,6 +80,10 @@ project(':mcp') { } } +task createChangelog(type: net.minecraftforge.gradleutils.tasks.GenerateChangelogTask) { + startingCommit = '45da4f6910abe824aa487056276f6bf2fadb7f24' +} + project(':clean') { evaluationDependsOn(':mcp') apply plugin: 'eclipse' @@ -124,7 +130,7 @@ project(':clean') { } } -project(':forge') { +project(':forge') { evaluationDependsOn(':clean') apply plugin: 'java-library' apply plugin: 'maven-publish' @@ -136,6 +142,10 @@ project(':forge') { compileJava.sourceCompatibility = compileJava.targetCompatibility = sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. group = 'net.minecraftforge' + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + } + sourceSets { main { java { @@ -204,6 +214,7 @@ project(':forge') { } version = getVersion() + logger.lifecycle "Version: $version" patcher { exc = file("$rootDir/src/main/resources/forge.exc") @@ -317,13 +328,10 @@ project(':forge') { rootProject.file('CREDITS.txt'), rootProject.file('LICENSE.txt'), rootProject.file('LICENSE-Paulscode IBXM Library.txt'), - rootProject.file('LICENSE-Paulscode SoundSystem CodecIBXM.txt') + rootProject.file('LICENSE-Paulscode SoundSystem CodecIBXM.txt'), + rootProject.file('build/changelog.txt') ] - def changelog = rootProject.file('build/changelog.txt') - if (changelog.exists()) - extraTxts += changelog - // We apply the bin patches we just created to make a jar that is JUST our changes genClientBinPatches.tool = BINPATCH_TOOL task applyClientBinPatches(type: ApplyBinPatches, dependsOn: genClientBinPatches) { @@ -622,6 +630,7 @@ project(':forge') { universalJar { from(extraTxts) dependsOn(deobfDataLzma) + dependsOn(rootProject.createChangelog) from(deobfDataLzma.output){ rename{"deobfuscation_data-${MC_VERSION}.lzma"} } @@ -651,11 +660,11 @@ project(':forge') { } task downloadInstaller(type: DownloadMavenArtifact) { - artifact = 'net.minecraftforge:installer:2.1.+:shrunk' + artifact = 'net.minecraftforge:installer:2.2.7:fatjar' changing = true } - task installerJar(type: Zip, dependsOn: [downloadInstaller, installerJson, launcherJson, genClientBinPatches, genServerBinPatches, 'signUniversalJar']) { + task installerJar(type: Zip, dependsOn: [downloadInstaller, installerJson, launcherJson, genClientBinPatches, genServerBinPatches, 'signUniversalJar', rootProject.createChangelog]) { classifier = 'installer' extension = 'jar' //Needs to be Zip task to not override Manifest, so set extension destinationDir = file('build/libs') @@ -694,7 +703,7 @@ project(':forge') { t.finalizedBy(tasks.getByName("sign${t.name.capitalize()}")) } - task makeMdk(type: Zip) { + task makeMdk(type: Zip, dependsOn: [rootProject.createChangelog]) { baseName = project.name classifier = 'mdk' version = project.version @@ -834,10 +843,10 @@ project(':forge') { publications { mavenJava(MavenPublication) { artifact universalJar - if (changelog.exists()) { - artifact(changelog) { - classifier = 'changelog' - } + artifact(rootProject.createChangelog.outputFile) { + builtBy rootProject.createChangelog + classifier = 'changelog' + extension = 'txt' } artifact installerJar //TODO: installer-win @@ -977,19 +986,21 @@ def getClasspath(project, libs, artifact) { return ret } -task ciWriteBuildNumber << { - def file = file('src/main/java/net/minecraftforge/common/ForgeVersion.java'); - def outfile = ''; - def ln = '\n'; //Linux line endings because we're on git! +task ciWriteBuildNumber { + doFirst { + def file = file('src/main/java/net/minecraftforge/common/ForgeVersion.java'); + def outfile = ''; + def ln = '\n'; //Linux line endings because we're on git! - file.eachLine{ String s -> - if (s.matches('^ public static final int buildVersion = [\\d]+;\$')) - s = " public static final int buildVersion = ${project(':forge').BUILD_NUMBER};" - if (s.matches('^ public static final String mcVersion = "[^\\"]+";')) - s = " public static final String mcVersion = \"${MC_VERSION}\";" - outfile += (s+ln); + file.eachLine{ String s -> + if (s.matches('^ public static final int buildVersion = [\\d]+;\$')) + s = " public static final int buildVersion = ${project(':forge').BUILD_NUMBER};" + if (s.matches('^ public static final String mcVersion = "[^\\"]+";')) + s = " public static final String mcVersion = \"${MC_VERSION}\";" + outfile += (s+ln); + } + file.write(outfile); } - file.write(outfile); } //evaluationDependsOnChildren() diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265ee94..0d4a951687 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 949819d28a..5028f28f8e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/src/main/java/net/minecraftforge/server/terminalconsole/MinecraftFormattingConverter.java b/src/main/java/net/minecraftforge/server/terminalconsole/MinecraftFormattingConverter.java index aff7184e25..a36b3b07ef 100644 --- a/src/main/java/net/minecraftforge/server/terminalconsole/MinecraftFormattingConverter.java +++ b/src/main/java/net/minecraftforge/server/terminalconsole/MinecraftFormattingConverter.java @@ -1,6 +1,6 @@ /* * Minecraft Forge - * Copyright (c) 2016-2021. + * Copyright (c) 2016-2020. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public