removing copies of the version number

Author: robertpatrick

Jenkinsfile

@@ -16,7 +16,7 @@
         node_version = "14.18.1"
 
         project_name = "$JOB_NAME"
-        version_prefix = "0.8.0"
+        version_prefix = sh(returnStdout: true, script: "cat ${WORKSPACE}/weblogic-toolkit-ui/electron/package.json | grep version | awk 'match($0, /[0-9]+.[0-9]+.[0-9]+/) { print substr( $0, RSTART, RLENGTH )}'")
         version_number = VersionNumber([versionNumberString: '-${BUILD_YEAR}${BUILD_MONTH,XX}${BUILD_DAY,XX}${BUILDS_TODAY_Z,XX}', versionPrefix: "${version_prefix}"])
 
         github_url = "${env.GIT_URL}"
@@ -43,7 +43,6 @@
                         stage('Linux Echo Environment') {
                             steps {
                                 sh 'env|sort'
-                                sh "git config --global http.https://github.com.proxy ${WKTUI_PROXY}"
                             }
                         }
                         stage('Linux Checkout') {
@@ -142,7 +141,6 @@
                         stage('MacOS Echo Environment') {
                             steps {
                                 sh 'env|sort'
-                                sh "git config --global http.https://github.com.proxy ${WKTUI_PROXY}"
                             }
                         }
                         stage('MacOS Checkout') {

WKTUI_VERSION.txt

@@ -1 +1 @@
-0.8.0-SNAPSHOT
+-SNAPSHOT

electron/app/js/wktApp.js

@@ -73,8 +73,9 @@ class WktApp {
           if (doesExist) {
             fsPromises.readFile(versionFilePath, 'utf8')
               .then(contents => {
-                if (!contents || contents.startsWith('This empty file')) {
-                  resolve(defaultVersion);
+                if (!contents || contents.startsWith('-')) {
+                  // dev build so concatenate the app version with the qualifier from the file
+                  resolve(`${defaultVersion}${contents.trim()}`);
                 } else {
                   resolve(contents.trim());
                 }

electron/app/test/wktApp-test.js

@@ -49,9 +49,11 @@ describe('WKT App tests', () => {
   const WktMode = proxyquire('../js/wktMode', { electron: electronStub });
 
   function getDefaultVersionNumber() {
+    const packageJsonFileName = path.normalize(path.join(__dirname, '..', '..', 'package.json'));
+    const packageJson = require(packageJsonFileName);
     const wktuiVersionFileName = path.normalize(path.join(__dirname, '..', '..', '..', 'WKTUI_VERSION.txt'));
-    const version = readFileSync(wktuiVersionFileName, { encoding: 'utf8'});
-    return version.trim();
+    const qualifier = readFileSync(wktuiVersionFileName, { encoding: 'utf8'});
+    return `${packageJson.version}${qualifier.trim()}`;
   }
 
   it('make sure application name works', () => {