studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comment out full failure pipeline step
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
austin 2024-09-01 19:54:26 -04:00
parent c30d409975
commit a24188e2c0
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Jenkinsfile vendored
View File

@ -48,7 +48,7 @@ pipeline {
script {
sh 'rm -f ./testsuccess'
catchError {
sh 'mvn test -P integration && touch ./testsuccess'
sh 'mvn test -P integration'
}
}
}
@ -59,33 +59,33 @@ pipeline {
}
}
}
stage('DebugTests') {
when {
expression {
!fileExists('./testsuccess')
}
}
steps {
wrap(
[
$class: 'Xvfb',
additionalOptions: '',
assignedLabels: '',
autoDisplayName: true,
debug: true,
displayNameOffset: 0,
installationName: 'Default',
parallelBuild: true,
screen: '1920x1080x24',
timeout: 25
]
) {
script {
sh 'curl https://build.lwjgl.org/addons/lwjglx-debug/lwjglx-debug-1.0.0.jar -v -L > ./lwjglx-debug-1.0.0.jar'
sh 'mvn test -P integrationDebug -DmaxLogs'
}
}
}
}
// stage('DebugTests') {
// when {
// expression {
// !fileExists('./testsuccess')
// }
// }
// steps {
// wrap(
// [
// $class: 'Xvfb',
// additionalOptions: '',
// assignedLabels: '',
// autoDisplayName: true,
// debug: true,
// displayNameOffset: 0,
// installationName: 'Default',
// parallelBuild: true,
// screen: '1920x1080x24',
// timeout: 25
// ]
// ) {
// script {
// sh 'curl https://build.lwjgl.org/addons/lwjglx-debug/lwjglx-debug-1.0.0.jar -v -L > ./lwjglx-debug-1.0.0.jar'
// sh 'mvn test -P integrationDebug -DmaxLogs'
// }
// }
// }
// }
}
}

2
src/main/java/electrosphere/engine/assetmanager/AssetManager.java
View File

@ -337,7 +337,7 @@ public class AssetManager {
File[] children = containingDirectory.listFiles();
if(children != null){
for(File child : children){
if(child.getName().equals("texturemap.json")){
if(child.getName().equals("texturemap.json") && !child.getName().contains(".\\assets")){
String rVal = child.getPath();
String fixed = rVal.replace(".\\assets", "");
return fixed;