Browse Source

Set correct vcredist version for windows-2022.

Ian Walton 3 years ago
parent
commit
3622e47d0c
1 changed files with 4 additions and 4 deletions
  1. 4 4
      .github/workflows/main.yml

+ 4 - 4
.github/workflows/main.yml

@@ -51,8 +51,8 @@ jobs:
     - name: Install dependencies
       run: |
         ./download_webclient.sh
-        ls -R "/c/Program Files/Microsoft Visual Studio/2022/"*"/VC/Redist/MSVC/"*
-        sed -i 's#Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Redist\\MSVC\\v142\\#'"$(ls -d "/c/Program Files/Microsoft Visual Studio/2022/"*"/VC/Redist/MSVC/v"* | head -n 1 | sed 's#/c/##g' | tr '/' '\\' | sed 's/\\/\\\\/g')\\\\#g" bundle/win/Bundle.wxs
+        #ls -R "/c/Program Files/Microsoft Visual Studio/2022/"*"/VC/Redist/MSVC/"*
+        sed -i 's#Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Redist\\MSVC\\v142\\vcredist_x64.exe#'"$(ls -d "/c/Program Files/Microsoft Visual Studio/2022/"*"/VC/Redist/MSVC/v"* | head -n 1 | sed 's#/c/##g' | tr '/' '\\' | sed 's/\\/\\\\/g')\\\\vc_redist.x64.exe#g" bundle/win/Bundle.wxs
         curl -L https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip > ninja.zip
         unzip ninja.zip
         mv ninja.exe build/
@@ -96,8 +96,8 @@ jobs:
     - name: Install dependencies
       run: |
         ./download_webclient.sh
-        ls -R "/c/Program Files/Microsoft Visual Studio/2022/"*"/VC/Redist/MSVC/"*
-        sed -i 's#Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Redist\\MSVC\\v142\\#'"$(ls -d "/c/Program Files/Microsoft Visual Studio/2022/"*"/VC/Redist/MSVC/v"* | head -n 1 | sed 's#/c/##g' | tr '/' '\\' | sed 's/\\/\\\\/g')\\\\#g" bundle/win/Bundle.wxs
+        #ls -R "/c/Program Files/Microsoft Visual Studio/2022/"*"/VC/Redist/MSVC/"*
+        sed -i 's#Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Redist\\MSVC\\v142\\vcredist_x86.exe#'"$(ls -d "/c/Program Files/Microsoft Visual Studio/2022/"*"/VC/Redist/MSVC/v"* | head -n 1 | sed 's#/c/##g' | tr '/' '\\' | sed 's/\\/\\\\/g')\\\\vc_redist.x86.exe#g" bundle/win/Bundle.wxs
         curl -L https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip > ninja.zip
         unzip ninja.zip
         mv ninja.exe build/