Selaa lähdekoodia

CI: Update Windows dependencies to VS2019 versions

Ryan Foster 4 vuotta sitten
vanhempi
sitoutus
1b215e463c
2 muutettua tiedostoa jossa 6 lisäystä ja 6 poistoa
  1. 2 2
      .github/workflows/main.yml
  2. 4 4
      CI/install-script-win.cmd

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

@@ -472,7 +472,7 @@ jobs:
       QT_VERSION: '5.15.2'
       CMAKE_GENERATOR: "Visual Studio 16 2019"
       CMAKE_SYSTEM_VERSION: "10.0.18363.657"
-      WINDOWS_DEPS_VERSION: '2017'
+      WINDOWS_DEPS_VERSION: '2019'
       VLC_VERSION: '3.0.0-git'
       TWITCH-CLIENTID: ${{ secrets.TWITCH_CLIENTID }}
       TWITCH-HASH: ${{ secrets.TWITCH_HASH }}
@@ -585,7 +585,7 @@ jobs:
       QT_VERSION: '5.15.2'
       CMAKE_GENERATOR: "Visual Studio 16 2019"
       CMAKE_SYSTEM_VERSION: "10.0.18363.657"
-      WINDOWS_DEPS_VERSION: '2017'
+      WINDOWS_DEPS_VERSION: '2019'
       TWITCH-CLIENTID: ${{ secrets.TWITCH_CLIENTID }}
       TWITCH-HASH: ${{ secrets.TWITCH_HASH }}
       RESTREAM-CLIENTID: ${{ secrets.RESTREAM-CLIENTID }}

+ 4 - 4
CI/install-script-win.cmd

@@ -1,13 +1,13 @@
-if exist dependencies2017.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies2017.zip -f --retry 5 -z dependencies2017.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies2017.zip -f --retry 5 -C -)
+if exist dependencies2019.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies2019.zip -f --retry 5 -z dependencies2019.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/dependencies2019.zip -f --retry 5 -C -)
 if exist vlc.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/vlc.zip -f --retry 5 -z vlc.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/vlc.zip -f --retry 5 -C -)
 if exist cef_binary_%CEF_VERSION%_windows32_minimal.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32_minimal.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows32_minimal.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32_minimal.zip -f --retry 5 -C -)
 if exist cef_binary_%CEF_VERSION%_windows64_minimal.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64_minimal.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows64_minimal.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64_minimal.zip -f --retry 5 -C -)
-7z x dependencies2017.zip -odependencies2017
+7z x dependencies2019.zip -odependencies2019
 7z x vlc.zip -ovlc
 7z x cef_binary_%CEF_VERSION%_windows32_minimal.zip -oCEF_32
 7z x cef_binary_%CEF_VERSION%_windows64_minimal.zip -oCEF_64
-set DepsPath32=%CD%\dependencies2017\win32
-set DepsPath64=%CD%\dependencies2017\win64
+set DepsPath32=%CD%\dependencies2019\win32
+set DepsPath64=%CD%\dependencies2019\win64
 set VLCPath=%CD%\vlc
 set QTDIR32=C:\QtDep\5.15.2\msvc2019
 set QTDIR64=C:\QtDep\5.15.2\msvc2019_64