fix: Don't set APP_BASE twice (#2198)

wireapp · Feb 13, 2019 · ec16c1d · ec16c1d
1 parent 2a7dd90
commit ec16c1d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/linux.Jenkinsfile b/linux.Jenkinsfile
@@ -15,7 +15,6 @@ node('node180') {
   def text = readFile('info.json')
   def buildInfo = parseJson(text)
   def version = buildInfo.version + '.' + env.BUILD_NUMBER
-  def app_base = params.APP_BASE
 
   currentBuild.displayName = version
 
@@ -30,15 +29,13 @@ node('node180') {
 
     stage('Build') {
       try {
-        withEnv(["APP_BASE=${app_base}"]) {
-          sh 'pip install -r requirements.txt'
-          sh 'node -v'
-          sh 'npm -v'
-          sh 'yarn'
-          sh 'yarn build:ts'
-          withCredentials([string(credentialsId: 'RAYGUN_API_KEY', variable: 'RAYGUN_API_KEY')]) {
-            sh 'npx grunt linux-prod'
-          }
+        sh 'pip install -r requirements.txt'
+        sh 'node -v'
+        sh 'npm -v'
+        sh 'yarn'
+        sh 'yarn build:ts'
+        withCredentials([string(credentialsId: 'RAYGUN_API_KEY', variable: 'RAYGUN_API_KEY')]) {
+          sh 'npx grunt linux-prod'
         }
       } catch(e) {
         currentBuild.result = 'FAILED'

diff --git a/windows.Jenkinsfile b/windows.Jenkinsfile
@@ -7,7 +7,6 @@ node('node160') {
 
   def production = params.PRODUCTION
   def custom = params.CUSTOM
-  def app_base = params.APP_BASE
   def app_name = params.APP_NAME
 
   def jenkinsbot_secret = ''
@@ -31,7 +30,7 @@ node('node160') {
     try {
       bat 'pip install -r requirements.txt'
       def NODE = tool name: 'node-v10.15.0-windows-x86', type: 'nodejs'
-      withEnv(["PATH+NODE=${NODE}", 'npm_config_target_arch=ia32', 'wire_target_arch=ia32', "APP_BASE=${app_base}"]) {
+      withEnv(["PATH+NODE=${NODE}", 'npm_config_target_arch=ia32', 'wire_target_arch=ia32']) {
         bat 'node -v'
         bat 'npm -v'
         bat 'npm install -g yarn'