ProgramAB with xml parser

.github/workflows/build.yml → .github/build.yml

@@ -1,3 +1,5 @@
+# This file must be in the .github/workflows folder for git actions to work
+# but currently is disabled, since builds are being done by jenkins
 name: Java CI
 
 on:
@@ -82,3 +84,4 @@ jobs:
           tag_name: ${{ steps.version.outputs.version }}
           generate_release_notes: true
           body_path: ./release-template.md
+

Jenkinsfile

@@ -6,7 +6,6 @@
  * Cancel all jobs - Jenkins.instance.queue.clear()
  ***********************************************************************************/
 
-
 pipeline {
    // https://plugins.jenkins.io/agent-server-parameter/
    // agent { label params['agent-name'] }
@@ -51,43 +50,25 @@ pipeline {
                echo "VERSION ${VERSION}"
                echo "BUILD_NUMBER ${BUILD_NUMBER}"
 
-
-
                print params['agent-name']
                // print System.properties['os.name'].toLowerCase() - access to java object requires permission changes
                script {
-                  if (isUnix()) {
                   sh '''
-                        echo isUnix true
                         git --version
                         java -version
                         mvn -version
 
                      '''
-                  echo sh(script: 'env|sort', returnStdout: true)
-                  } else {
-                  bat '''
-                        echo isUnix false
-                        git --version
-                        java -version
-                        mvn -version
-                        set
-                     '''
                   }
                }
-            }
         } // stage build
 
       stage('compile') {
          steps {
             script {
-               if (isUnix()) {
                   sh '''
                      mvn -Dbuild.number=${BUILD_NUMBER} -DskipTests -q clean compile
                   '''
-               } else {
-                  bat(/"${MAVEN_HOME}\bin\mvn" -Dbuild.number=${BUILD_NUMBER} -DskipTests -q clean compile  /)
-               }
             }
          }
       } // stage compile
@@ -98,91 +79,65 @@ pipeline {
          }
          steps {
             script {
-               // TODO - integration tests !
-               if (isUnix()) {
                   sh '''
                      mvn test -Dtest=org.myrobotlab.framework.DependencyTest -q
                   '''
-               } else {
-                  bat '''
-                     mvn test -Dtest=org.myrobotlab.framework.DependencyTest -q
-                  '''
-               }
             }
          }
-      } // stage verify      
+      } // stage dependencies      
 
       stage('verify') {
          when {
                expression { params.verify == 'true' }
          }
          steps {
             script {
-               // TODO - integration tests !
-               if (isUnix()) {
                   sh '''
                      mvn -Dfile.encoding=UTF-8 -DargLine="-Xmx1024m" verify --fail-fast -q
                   '''
-               } else {
-                  bat '''
-                     mvn -Dfile.encoding=UTF-8 -DargLine="-Xmx1024m" verify --fail-fast -q
-                  '''
-               }
             }
          }
       } // stage verify
 
       stage('package') {
          steps {
             script {
-               if (isUnix()) {
                   sh '''
                      mvn -Dbuild.number=${BUILD_NUMBER} -DskipTests -q package
                   '''
-               } else {
-                  bat(/"${MAVEN_HOME}\bin\mvn" -Dbuild.number=${BUILD_NUMBER} -DskipTests -q package  /)
-               }
             }
          }
-      } // stage compile
+      } // stage package
 
       stage('javadoc') {
-         // when {
-         //         // expression { params.javadoc == 'true' }
-         //         expression { env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'develop' }
-         // }
+         when {
+                 // expression { params.javadoc == 'true' }
+                 expression { env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'develop' }
+         }
          steps {
-            script {
-               if (isUnix()) {
                   sh '''
                      mvn -q javadoc:javadoc
                   '''
-               } else {
-                  bat '''
-                     mvn -q javadoc:javadoc
-                  '''
-               }
             }
-         }
       } // stage javadoc
 
-      stage('archive-min') {
-         when {
-            expression { env.BRANCH_NAME != 'master' && env.BRANCH_NAME != 'develop' }
-         }
+      stage('archive') {
+         // when {
+         //    expression { env.BRANCH_NAME != 'master' && env.BRANCH_NAME != 'develop' }
+         // }
          steps {
-            archiveArtifacts 'target/myrobotlab.jar, target/surefire-reports/*, target/*.exec'
+            archiveArtifacts 'target/myrobotlab.jar, target/surefire-reports/**, target/*.exec, target/site/**'
          }
       }
 
-      stage('archive-javadocs') {
-         when {
-            expression { env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'develop' }
-         }
-         steps {
-            archiveArtifacts 'target/myrobotlab.zip, target/surefire-reports/*, target/*.exec, target/site/**'
-         }
-      }
+      // stage('archive-javadocs') {
+      //    when {
+      //       expression { env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'develop' }
+      //    }
+      //    steps {
+      //       archiveArtifacts 'target/myrobotlab.zip, target/surefire-reports/*, target/*.exec, target/site/**'
+      //    }
+      // }
 
       // stage('jacoco') {
       //    steps {
@@ -192,9 +147,10 @@ pipeline {
       // }
 
       stage('publish-github') {
-         when { expression { env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'develop' } }
+         // when { expression { env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'develop' } }
+         when { expression { env.BRANCH_NAME == 'master'} }
          steps {
-            withCredentials([string(credentialsId: 'github-token-2', variable: 'token')]) { // var name "token" is set in cred config and is case senstive
+            withCredentials([string(credentialsId: 'supertick-github-token', variable: 'token')]) { // var name "token" is set in cred config and is case senstive
                echo "publishing ${VERSION_PREFIX}.${BUILD_NUMBER}"
                echo "version ${VERSION}"
                // for security - your supposed to make it non-interpretive single quotes and let the OS process the interpolation
@@ -217,5 +173,12 @@ pipeline {
          }
       }
 
+      always {
+            // publish junit
+            junit 'target/surefire-reports/**/*.xml'
+            // Publish JaCoCo coverage report
+            jacoco(execPattern: '**/target/jacoco.exec')
+      }
+
   } // post
 } // pipeline

pom.xml

@@ -2025,9 +2025,8 @@
           <excludes>
             <exclude>**/integration/*</exclude>
             <!-- unfortunately not testing OpenCV is required for ci to work -->
-            <exclude>**/OpenCV*</exclude>
           </excludes>
-          <!-- required so surefire doesnt die talking to the agent over stdin-->
+          <!-- required so surefire doesnt die talking to the agent over stdin -->
           <forkNode
             implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
         </configuration>