Merge pull request #13292 from electron/fix-release-tests

build:Fix VSTS config for release builds

vsts.yml

@@ -44,34 +44,25 @@ steps:
   condition: and(succeeded(), eq(variables['ELECTRON_RELEASE'], '1'))
 
 - bash: |
-    echo 'Testing Electron debug build'
+    echo 'Testing Electron build'
     mkdir junit
     export MOCHA_FILE="junit/test-results.xml"
     export MOCHA_REPORTER="mocha-junit-reporter"
-    script/test.py --ci --rebuild_native_modules
+    if [ "$ELECTRON_RELEASE" == "1" ]; then
+      script/test.py --ci --rebuild_native_modules -c R
+    else
+      script/test.py --ci --rebuild_native_modules
+    fi
   name: Test
-  condition: and(succeeded(), ne(variables['ELECTRON_RELEASE'], '1'))
 
 - bash: |
-    echo 'Testing Electron release build'
+    echo 'Verifying ffmpeg on build'
-    mkdir junit
+    if [ "$ELECTRON_RELEASE" == "1" ]; then
-    export MOCHA_FILE="junit/test-results.xml"
+      script/verify-ffmpeg.py -R
-    export MOCHA_REPORTER="mocha-junit-reporter"
+    else
-    script/test.py --ci --rebuild_native_modules -c R
+      script/verify-ffmpeg.py
-  name: Test
+    fi
-  condition: and(succeeded(), eq(variables['ELECTRON_RELEASE'], '1'))
-
-- bash: |
-    echo 'Verifying ffmpeg on debug build'
-    script/verify-ffmpeg.py
   name: Verify_FFmpeg
-  condition: and(succeeded(), ne(variables['ELECTRON_RELEASE'], '1'))
-
-- bash: |
-    echo 'Verifying ffmpeg on release build'
-    script/verify-ffmpeg.py -R
-  name: Verify_FFmpeg
-  condition: and(succeeded(), eq(variables['ELECTRON_RELEASE'], '1'))
 
 - task: PublishTestResults@2
   displayName: Publish Test Results