From 4671a295f55b2cc81a4ec65c64d5f4868c024e7c Mon Sep 17 00:00:00 2001
From: gitadmin <gitadmin@noreply.localhost>
Date: Mon, 26 Feb 2024 11:37:06 -0500
Subject: [PATCH] jenkinsdebug1 (#135)

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
---
 Jenkinsfile                                   | 19 +++++++++++++++----
 buildNumber.properties                        |  4 ++--
 .../java/electrosphere/engine/Globals.java    |  3 ---
 src/main/java/electrosphere/engine/Main.java  | 17 ++++++++++++++---
 src/test/java/startup/StartupTest.java        | 11 +----------
 5 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b3fdcd0f..c5d0a446 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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'
                 }
             }
         }
diff --git a/buildNumber.properties b/buildNumber.properties
index 54ad855a..551140c3 100644
--- a/buildNumber.properties
+++ b/buildNumber.properties
@@ -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
diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java
index ee69aa9a..02719b3c 100644
--- a/src/main/java/electrosphere/engine/Globals.java
+++ b/src/main/java/electrosphere/engine/Globals.java
@@ -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;
     
     
diff --git a/src/main/java/electrosphere/engine/Main.java b/src/main/java/electrosphere/engine/Main.java
index d5cf2c20..c01dec05 100644
--- a/src/main/java/electrosphere/engine/Main.java
+++ b/src/main/java/electrosphere/engine/Main.java
@@ -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,8 +296,14 @@ public class Main {
                 Globals.renderingEngine.drawScreen();
             }
             
-            if(Globals.ENGINE_SHUTDOWN_FLAG || (!Globals.HEADLESS && Globals.RUN_CLIENT && glfwWindowShouldClose(Globals.window))){
-                running = false;
+            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){
diff --git a/src/test/java/startup/StartupTest.java b/src/test/java/startup/StartupTest.java
index 47c3f6dd..cb619a28 100644
--- a/src/test/java/startup/StartupTest.java
+++ b/src/test/java/startup/StartupTest.java
@@ -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);