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

jenkinsdebug1 (#135)
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
Details

Browse Source 
add post phase

remove deliver stage from pipeline

make headless test actually headless

removing glfw from headless main

remove glfw from globals

jenkins more work

jenkins env var work

maven flag fixs

Add deliver step

junit declaration work

add empty results files

jenkins maven text debug work

attempt profile in jenkins maven

add testing

fix maven version

add maven versionj

label maven as tool

convert to no container build again

more jenkins work

more jenkins work

reorg

debug jenkins work

Co-authored-by: austin <austin@austinwhoover.com>
Reviewed-on: https://git.austinwhoover.com/electrosphere/Renderer/pulls/135
This commit is contained in:
gitadmin 2024-02-26 11:37:06 -05:00
parent a5a669da90
commit 4671a295f5
5 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Jenkinsfile vendored
View File

@ -1,12 +1,23 @@
pipeline {
agent { docker { image 'maven:3-eclipse-temurin-17' } }
agent any
tools {
maven '3.9.6'
}
stages {
stage('build') {
stage('Build') {
steps {
sh 'mvn --version'
sh 'java -version'
configFileProvider([configFile(fileId: 'a00c9e64-9b32-4c24-9216-80b9d568358d', variable: 'MAVEN_SETTINGS_XML')]) {
sh 'mvn -U --batch-mode -s $MAVEN_SETTINGS_XML clean install -P foo'
sh 'mvn -B -DskipTests clean package'
}
}
stage('Test') {
steps {
sh 'mvn test'
}
post {
always {
junit 'target/surefire-reports/*.xml'
}
}
}

4
buildNumber.properties
View File

@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
#Sun Feb 25 20:01:36 EST 2024
buildNumber=14
#Mon Feb 26 10:41:04 EST 2024
buildNumber=22

3
src/main/java/electrosphere/engine/Globals.java
View File

@ -7,7 +7,6 @@ import java.util.List;
import org.joml.Matrix4f;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.lwjgl.glfw.GLFWErrorCallback;
import electrosphere.audio.AudioEngine;
import electrosphere.auth.AuthenticationManager;
@ -174,8 +173,6 @@ public class Globals {
//
//Generic OpenGL Statements
//
//Callback function for opengl errors
public final static GLFWErrorCallback ERROR_CALLBACK = GLFWErrorCallback.createPrint(System.err);
public static long window;

15
src/main/java/electrosphere/engine/Main.java
View File

@ -214,7 +214,12 @@ public class Main {
/*
Frame calculation
*/
double currentTime = glfwGetTime();
double currentTime = 0;
if(Globals.HEADLESS){
currentTime = System.currentTimeMillis();
} else {
currentTime = glfwGetTime();
}
deltaTime = currentTime - lastFrame;
deltaFrames = targetFrameRate * (float)deltaTime;
lastFrame = currentTime;
@ -291,9 +296,15 @@ public class Main {
Globals.renderingEngine.drawScreen();
}
if(Globals.ENGINE_SHUTDOWN_FLAG || (!Globals.HEADLESS && Globals.RUN_CLIENT && glfwWindowShouldClose(Globals.window))){
if(Globals.HEADLESS){
if(Globals.ENGINE_SHUTDOWN_FLAG){
running = false;
}
} else {
if(Globals.ENGINE_SHUTDOWN_FLAG || (Globals.RUN_CLIENT && glfwWindowShouldClose(Globals.window))){
running = false;
}
}
if(deltaTime < targetFramePeriod){
sleep((int)(1000.0 * (targetFramePeriod - deltaTime)));

11
src/test/java/startup/StartupTest.java
View File

@ -13,16 +13,7 @@ public class StartupTest extends TestCase {
System.out.println("[Test] Startup Headless");
Globals.RUN_CLIENT = false;
Globals.RUN_SERVER = true;
NetUtils.setPort(0);
Main.startUp();
Main.mainLoop(1);
}
@Test
public void testStartupGUI(){
System.out.println("[Test] Startup GUI");
Globals.RUN_CLIENT = false;
Globals.RUN_SERVER = true;
Globals.HEADLESS = true;
NetUtils.setPort(0);
Main.startUp();
Main.mainLoop(1);