From 88a22b488987497c6d676f0446cad5e2bdf25b29 Mon Sep 17 00:00:00 2001
From: Fedor Katurov <gotham48@gmail.com>
Date: Mon, 20 Apr 2020 10:16:12 +0700
Subject: [PATCH] fixed jenkins for PRs

---
 Jenkinsfile | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 76ccde52..073482d3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,20 +7,14 @@ pipeline {
     }
 
     stages {
-        stage('check') {
+        stage('') {
             steps {
-                echo "WWW: ${WWW}"
-                echo "ENV: ${ENV}"
-                echo "WORKSPACE: ${WORKSPACE}"
-                sh 'pwd'
-                sh 'ls'
+                echo "WWW: ${WWW}\nENV: ${ENV}\n"
 
                 script {
-                    if("${WWW}" == "" || "${ENV}" == "" || ("${env.BRANCH_NAME}" != "master" && "${env.BRANCH_NAME}" != "develop")) {
-                        println "INCORRECT VARIABLES"
+                    if("${WWW}" == "" || "${ENV}" == "" {
                         currentBuild.result = 'FAILED'
-                        failed = true
-                        error "Build failed :-("
+                        error "No valid deploy dirs"
                         return
                     }
                 }
@@ -33,14 +27,18 @@ pipeline {
             }
         }
 
-        stage('Build') {
+        stage('build') {
             steps {
-                sh 'npm install'
-                sh 'npm run build'
+                sh 'yarn'
+                sh 'yarn build'
             }
         }
 
         stage('deploy') {
+            when {
+                anyOf { branch 'master'; branch 'develop' }
+            }
+
             steps{
                 sh "rm -rf ${WWW}"
                 sh "mv ${WORKSPACE}/dist ${WWW}"