mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-12 00:07:45 +00:00
Fix J13 ambiguous reference and JenkinsFile skipping a step.
This commit is contained in:
1 parent
db6ab2a19e
commit
54f9ca540e
2 files changed
+13
-3
No files matched your search
Vendored
+10
@@ -18,11 +18,13 @@ pipeline {
|
||||
}
|
||||
|
||||
stages {
|
||||
/* This resets the checkout on jenkins, but doesn't take branch into account...
|
||||
stage('fetch') {
|
||||
steps {
|
||||
checkout scm
|
||||
}
|
||||
}
|
||||
*/
|
||||
stage('notify_start') {
|
||||
when {
|
||||
not {
|
||||
@@ -49,6 +51,14 @@ pipeline {
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('setup') {
|
||||
steps {
|
||||
sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue setup'
|
||||
script {
|
||||
env.MYVERSION = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "version:" | awk \'{print $2}\'').trim()
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('changelog') {
|
||||
when {
|
||||
not {
|
||||
|
||||
@@ -654,7 +654,7 @@ public class CraftingHelper {
|
||||
|
||||
if (mod.getSource().isFile())
|
||||
{
|
||||
fs = FileSystems.newFileSystem(mod.getSource().toPath(), null);
|
||||
fs = FileSystems.newFileSystem(mod.getSource().toPath(), (ClassLoader)null);
|
||||
fPath = fs.getPath("/" + base, "_factories.json");
|
||||
}
|
||||
else if (mod.getSource().isDirectory())
|
||||
@@ -791,7 +791,7 @@ public class CraftingHelper {
|
||||
{
|
||||
try
|
||||
{
|
||||
fs = FileSystems.newFileSystem(source.toPath(), null);
|
||||
fs = FileSystems.newFileSystem(source.toPath(), (ClassLoader)null);
|
||||
root = fs.getPath("/" + base);
|
||||
}
|
||||
catch (IOException e)
|
||||
@@ -885,7 +885,7 @@ public class CraftingHelper {
|
||||
Path fPath = null;
|
||||
if(mod.getSource().isFile())
|
||||
{
|
||||
try(FileSystem fs = FileSystems.newFileSystem(mod.getSource().toPath(), null))
|
||||
try(FileSystem fs = FileSystems.newFileSystem(mod.getSource().toPath(), (ClassLoader)null))
|
||||
{
|
||||
fPath = fs.getPath("assets", path.getResourceDomain(), path.getResourcePath());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user