From dace4075e424a54cf9de787e8aade33d88d41da6 Mon Sep 17 00:00:00 2001
From: Ivan Savenko <saven.ivan@gmail.com>
Date: Sun, 27 Oct 2024 17:45:12 +0000
Subject: [PATCH] Changes according to review

---
 .github/workflows/github.yml | 14 ++++++++++----
 CI/before_install/msvc.sh    |  9 ++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml
index 7c6eeb463..5c9ab602a 100644
--- a/.github/workflows/github.yml
+++ b/.github/workflows/github.yml
@@ -38,6 +38,7 @@ jobs:
             os: macos-13
             test: 0
             pack: 1
+            upload: 1
             pack_type: Release
             extension: dmg
             before_install: macos.sh
@@ -50,6 +51,7 @@ jobs:
             os: macos-13
             test: 0
             pack: 1
+            upload: 1
             pack_type: Release
             extension: dmg
             before_install: macos.sh
@@ -62,6 +64,7 @@ jobs:
             os: macos-13
             test: 0
             pack: 1
+            upload: 1
             pack_type: Release
             extension: ipa
             before_install: macos.sh
@@ -89,6 +92,7 @@ jobs:
             os: ubuntu-24.04
             test: 0
             pack: 1
+            upload: 1
             pack_type: Release
             extension: exe
             cmake_args: -G Ninja
@@ -109,6 +113,7 @@ jobs:
             conan_prebuilts: dependencies-mingw-x86
           - platform: android-32
             os: ubuntu-24.04
+            upload: 1
             extension: apk
             preset: android-conan-ninja-release
             before_install: android.sh
@@ -117,6 +122,7 @@ jobs:
             artifact_platform: armeabi-v7a
           - platform: android-64
             os: ubuntu-24.04
+            upload: 1
             extension: apk
             preset: android-conan-ninja-release
             before_install: android.sh
@@ -244,11 +250,11 @@ jobs:
         elif [[ (${{matrix.preset}} == android-conan-ninja-release) && (${{github.ref}} != 'refs/heads/master') ]]
         then
             cmake -DENABLE_CCACHE:BOOL=ON -DANDROID_GRADLE_PROPERTIES="applicationIdSuffix=.daily;signingConfig=dailySigning;applicationLabel=VCMI daily" --preset ${{ matrix.preset }}
-        elif [[ (${{matrix.platform}} != msvc-x64) && (${{matrix.platform}} != msvc-x86) ]]
+        elif [[ ${{startsWith(matrix.platform, 'msvc') }} ]]
         then
-            cmake -DENABLE_CCACHE:BOOL=ON --preset ${{ matrix.preset }}
-        else
             cmake --preset ${{ matrix.preset }}
+        else
+            cmake -DENABLE_CCACHE:BOOL=ON --preset ${{ matrix.preset }}
         fi
 
     - name: Build
@@ -336,7 +342,7 @@ jobs:
             ${{github.workspace}}/**/*.pdb
 
     - name: Upload build
-      if: ${{ (matrix.pack == 1 || startsWith(matrix.platform, 'android')) && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/beta' || github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/features/')) && matrix.platform != 'msvc-x64' && matrix.platform != 'msvc-x86' && matrix.platform != 'mingw-32' }}
+      if: ${{ (matrix.upload == 1) && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/beta' || github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/features/')) }}
       continue-on-error: true
       run: |
         if [ -z '${{ env.ANDROID_APK_PATH }}' ] ; then
diff --git a/CI/before_install/msvc.sh b/CI/before_install/msvc.sh
index 82d5d2b5d..a0f7687f6 100644
--- a/CI/before_install/msvc.sh
+++ b/CI/before_install/msvc.sh
@@ -3,14 +3,13 @@
 MSVC_INSTALL_PATH=$(vswhere -latest -property installationPath)
 echo "MSVC_INSTALL_PATH = $MSVC_INSTALL_PATH"
 echo "Installed toolset versions:"
-ls -vr "$MSVC_INSTALL_PATH"/VC/Tools/MSVC
+ls -vr "$MSVC_INSTALL_PATH/VC/Tools/MSVC"
 
-TOOLS_DIR=$(ls -vr "$MSVC_INSTALL_PATH"/VC/Tools/MSVC/ | head -1)
-DUMPBIN_PATH="$MSVC_INSTALL_PATH"/VC/Tools/MSVC/"$TOOLS_DIR"/bin/Hostx64/x64/dumpbin.exe
+TOOLS_DIR=$(ls -vr "$MSVC_INSTALL_PATH/VC/Tools/MSVC/" | head -1)
+DUMPBIN_PATH="$MSVC_INSTALL_PATH/VC/Tools/MSVC/$TOOLS_DIR/bin/Hostx64/x64/dumpbin.exe"
 
-# This script should also work, but for some reason is *extremely* slow on Github CI (~7 minutes)
+# This command should work as well, but for some reason it is *extremely* slow on the Github CI (~7 minutes)
 #DUMPBIN_PATH=$(vswhere -latest -find **/dumpbin.exe | head -n 1)
-#
 
 echo "TOOLS_DIR = $TOOLS_DIR"
 echo "DUMPBIN_PATH = $DUMPBIN_PATH"