From 02c8cf294d2657115e37796cceef6267b7c7e5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Domeradzki?= <JustArchi@JustArchi.net>
Date: Thu, 5 Dec 2019 19:25:42 +0100
Subject: [PATCH] CI improvements (#1541)

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* More tests

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* More tests

* Update .travis.yml

* Update .travis.yml
---
 .travis.yml  | 27 ++++++++++-----------------
 appveyor.yml | 10 ++--------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 91f820b79..77680f8b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,19 +27,9 @@ script:
   - |
     set -eu
 
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-        set +eu # This is needed to run below npm block on OSX
-    fi
-
-    (
-        cd ASF-ui
-        npm ci
-        npm run-script deploy
-    )
-
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-        set -eu # We no longer need +eu on OSX
-    fi
+    nvm install lts/*
+    npm ci --no-progress --prefix ASF-ui
+    npm run-script deploy --no-progress --prefix ASF-ui
 
     dotnet build ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" /nologo
     dotnet build ArchiSteamFarm.CustomPlugins.ExamplePlugin -c "$CONFIGURATION" -f "$NET_CORE_VERSION" /nologo
@@ -61,16 +51,19 @@ script:
 
     dotnet restore ArchiSteamFarm
 
+    jobs=""
+
     for variant in $VARIANTS; do
         publish "$variant" &
+        jobs="$jobs $!"
+    done
+
+    for job in $jobs; do
+        wait "$job"
     done
 
-    wait
     set +u # This is needed to continue Travis build
 matrix:
-  # TODO: Remove failure allow once Linux works with 3.0
-  allow_failures:
-    - os: linux
   # We can use fast finish, as we don't need to wait for allow_failures builds to mark build as success
   fast_finish: true
   include:
diff --git a/appveyor.yml b/appveyor.yml
index 8adf2132d..b232ebc6f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -82,10 +82,7 @@ build_script:
     $ProgressPreference = 'SilentlyContinue'
 
 
-    Push-Location ASF-ui
-
-
-    npm ci
+    npm ci --no-progress --prefix ASF-ui
 
 
     if ($LastExitCode -ne 0) {
@@ -93,7 +90,7 @@ build_script:
     }
 
 
-    npm run-script deploy
+    npm run-script deploy --no-progress --prefix ASF-ui
 
 
     if ($LastExitCode -ne 0) {
@@ -101,9 +98,6 @@ build_script:
     }
 
 
-    Pop-Location
-
-
     dotnet build ArchiSteamFarm -c "$env:CONFIGURATION" -f "$env:NET_CORE_VERSION" /nologo