Merge pull request #25 from tknie/main

Various updates for next release

Author: thknieling

.eslintrc.js

@@ -14,10 +14,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: '41 12 * * 4'
 

.github/workflows/codeql-analysis.yml

@@ -5,9 +5,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

.github/workflows/node.js.yml

@@ -1,25 +1,54 @@
+def version = '7.1.0.0'
+def buildVersion = version+'.' + currentBuild.number
+
+properties([parameters([
+      string(
+        defaultValue: params.gitRepository ?:'your default value',
+        name: 'gitRepository',
+        trim: true
+      ),
+      string(
+        defaultValue: params.artifactory ?:'your default value',
+        name: 'artifactory',
+        trim: true
+      ),
+      gitParameter(branch: '', branchFilter: '.*',
+        defaultValue: '*/main', description: '', name: 'gitbranch',
+        quickFilterEnabled: false, selectedValue: 'NONE', sortMode: 'NONE',
+        tagFilter: '*', type: 'PT_BRANCH_TAG')
+    ])
+])
+
 node('docker-builds') {
     environment {
         CI = 'true' 
     }
     stage('Checkout') {
        checkout([$class: 'GitSCM', branches: [
-         [name: '*/master']
+         [name: gitbranch]
        ], doGenerateSubmoduleConfigurations: false, extensions: [
-         [$class: 'CleanBeforeCheckout']
+         [$class: 'CleanBeforeCheckout', deleteUntrackedNestedRepositories: true]
        ], submoduleCfg: [], userRemoteConfigs: [
-         [url: 'https://softwareag.com/Adabas/adabas-rest-webapp-mirror.git']
+         [credentialsId: 'github-sag-tkn', url: gitRepository]
        ]])
     }
-    docker.image('node:14.5.0-alpine').inside {
-    withEnv([
+    docker.image('node:14.15.4-alpine').inside {
+      withEnv([
         'HOME=.',
-    ]){
-    stage('Install') {
-      sh 'npm install'
+      ]){
+        stage('Install') {
+          sh 'rm -f node_modules dist;npm install'
+        }
+        stage('Build') {
+          sh 'npm run build'
+        }
+      }
+    }
+    stage('Upload') {
+      withCredentials([usernamePassword(credentialsId: 'adatestNexus', 
+          passwordVariable: 'NEXUS_PASS', usernameVariable: 'NEXUS_USER')]) {
+          sh 'cd dist;tar cfvz adabas-rest-webApp.tar.gz *'
+          sh 'curl -v -u '+env.NEXUS_USER+':'+env.NEXUS_PASS+' -X POST "'+artifactory+'/service/rest/v1/components?repository=maven-sag" -F maven2.groupId=com.softwareag.common -F maven2.artifactId=adabas-rest-webApp -F maven2.version='+version+' -F maven2.asset1=@dist/adabas-rest-webApp.tar.gz -F maven2.asset1.extension=tar.gz'
+      }
     }
-    stage('Build') {
-      sh 'npm run build'
-    }}
-  }
 }