From 918488a2f0009ef70a0f86d9e2e504b9dc54676f Mon Sep 17 00:00:00 2001
From: Alexey Kuzmin <alex.s.kuzmin@gmail.com>
Date: Sun, 7 Oct 2018 16:05:20 +0200
Subject: [PATCH] ci: various fixes (#15004)

 - ci: don't send Slack notifications for the "linux-ia32-testing-tests" job
 - ci: fix symbols collection job on VSTS
 - ci: run tests on Windows for both "testing" and "release" builds
---
 .circleci/config.yml |  1 -
 appveyor.yml         | 10 +++++++---
 vsts.yml             |  7 ++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fcd874a91632..2b8ff759dc62 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -932,7 +932,6 @@ jobs:
     environment:
       <<: *env-ia32
       <<: *env-headless-testing
-      <<: *env-send-slack-notifications
     <<: *steps-tests
 
   linux-ia32-release-tests:
diff --git a/appveyor.yml b/appveyor.yml
index d42c16098aab..008961ad64a8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -51,16 +51,20 @@ build_script:
         appveyor PushArtifact out/Default/symbols.zip
       }
 test_script:
-  - if "%GN_CONFIG%"=="testing" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
   - ps: >-
-      if ($env:GN_CONFIG -eq 'testing') {
+      if ((-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
+        $env:RUN_TESTS="true"
+      }
+  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
+  - ps: >-
+      if ($env:RUN_TESTS -eq 'true') {
         New-Item .\out\Default\gen\node_headers\Release -Type directory
         Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib
       } else {
         echo "Skipping tests for $env:GN_CONFIG build"
       }
   - cd electron
-  - if "%GN_CONFIG%"=="testing" ( echo Running test suite & npm run test -- --ci )
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & npm run test -- --ci )
   - cd ..
 deploy_script:
   - cd electron
diff --git a/vsts.yml b/vsts.yml
index e1de021b27bb..c007fd6b3c1d 100644
--- a/vsts.yml
+++ b/vsts.yml
@@ -71,12 +71,13 @@ jobs:
       cd src
       # Build needed dump_syms executable
       ninja -C out/Default third_party/breakpad:dump_syms
-      electron/script/dump-symbols.py -d "$PWD/out/Default/electron.breakpad.syms"
 
-      # TODO(alexeykuzmin): Explicitly pass an out folder path to the "zip-symbols.py" script.
+      # TODO(alexeykuzmin): Explicitly pass an out folder path to the scripts.
       export ELECTRON_OUT_DIR=Default
+
+      electron/script/dump-symbols.py -d "$PWD/out/Default/electron.breakpad.syms"
       electron/script/zip-symbols.py
-    displayName: Ninja build app
+    displayName: Collect symbols
     condition: and(succeeded(), eq(variables['ELECTRON_RELEASE'], '1'))
 
   - bash: |