浏览代码

CI: Update Windows CEF version

Gol-D-Ace 6 年之前
父节点
当前提交
05888fc3aa
共有 3 个文件被更改,包括 10 次插入10 次删除
  1. 6 6
      CI/install-script-win.cmd
  2. 3 3
      appveyor.yml
  3. 1 1
      azure-pipelines.yml

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

@@ -1,18 +1,18 @@
 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 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 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 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.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows32.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows32.zip -f --retry 5 -C -)
-if exist cef_binary_%CEF_VERSION%_windows64.zip (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64.zip -f --retry 5 -z cef_binary_%CEF_VERSION%_windows64.zip) else (curl -kLO https://cdn-fastly.obsproject.com/downloads/cef_binary_%CEF_VERSION%_windows64.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 dependencies2017.zip -odependencies2017
 7z x vlc.zip -ovlc
 7z x vlc.zip -ovlc
-7z x cef_binary_%CEF_VERSION%_windows32.zip -oCEF_32
-7z x cef_binary_%CEF_VERSION%_windows64.zip -oCEF_64
+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 DepsPath32=%CD%\dependencies2017\win32
 set DepsPath64=%CD%\dependencies2017\win64
 set DepsPath64=%CD%\dependencies2017\win64
 set VLCPath=%CD%\vlc
 set VLCPath=%CD%\vlc
 set QTDIR32=C:\QtDep\5.10.1\msvc2017
 set QTDIR32=C:\QtDep\5.10.1\msvc2017
 set QTDIR64=C:\QtDep\5.10.1\msvc2017_64
 set QTDIR64=C:\QtDep\5.10.1\msvc2017_64
-set CEF_32=%CD%\CEF_32\cef_binary_%CEF_VERSION%_windows32
-set CEF_64=%CD%\CEF_64\cef_binary_%CEF_VERSION%_windows64
+set CEF_32=%CD%\CEF_32\cef_binary_%CEF_VERSION%_windows32_minimal
+set CEF_64=%CD%\CEF_64\cef_binary_%CEF_VERSION%_windows64_minimal
 set build_config=RelWithDebInfo
 set build_config=RelWithDebInfo
 mkdir build build32 build64
 mkdir build build32 build64
 if "%TWITCH-CLIENTID%"=="$(twitch_clientid)" (
 if "%TWITCH-CLIENTID%"=="$(twitch_clientid)" (

+ 3 - 3
appveyor.yml

@@ -4,7 +4,7 @@ image:
 
 
 environment:
 environment:
   CURL_VERSION: 7.56.1
   CURL_VERSION: 7.56.1
-  CEF_VERSION: 3.3440.1805.gbe070f9
+  CEF_VERSION: 75.1.16+g16a67c4+chromium-75.0.3770.100
   APPVEYOR_YML_DISABLE_PS_LINUX: true
   APPVEYOR_YML_DISABLE_PS_LINUX: true
   TWITCH-CLIENTID:
   TWITCH-CLIENTID:
     secure: D3vFGk41HZaJWAZu5slwAHZhB868mGI2aIMS03L2rt4=
     secure: D3vFGk41HZaJWAZu5slwAHZhB868mGI2aIMS03L2rt4=
@@ -43,8 +43,8 @@ test: off
 cache:
 cache:
   - dependencies2017.zip
   - dependencies2017.zip
   - vlc.zip
   - vlc.zip
-  - 'cef_binary_%CEF_VERSION%_windows32.zip'
-  - 'cef_binary_%CEF_VERSION%_windows64.zip'
+  - 'cef_binary_%CEF_VERSION%_windows32_minimal.zip'
+  - 'cef_binary_%CEF_VERSION%_windows64_minimal.zip'
   - Qt_5.10.1.7z
   - Qt_5.10.1.7z
 
 
 notifications:
 notifications:

+ 1 - 1
azure-pipelines.yml

@@ -3,7 +3,7 @@
 variables:
 variables:
   CMAKE_PREFIX_PATH: /usr/local/opt/qt5/lib/cmake
   CMAKE_PREFIX_PATH: /usr/local/opt/qt5/lib/cmake
   CEF_BUILD_VERSION: 3.3282.1726.gc8368c8 
   CEF_BUILD_VERSION: 3.3282.1726.gc8368c8 
-  CEF_VERSION: 3.3440.1805.gbe070f9
+  CEF_VERSION: 75.1.16+g16a67c4+chromium-75.0.3770.100
   TWITCH-CLIENTID: $(twitch_clientid)
   TWITCH-CLIENTID: $(twitch_clientid)
   TWITCH-HASH: $(twitch_hash)
   TWITCH-HASH: $(twitch_hash)
   MIXER-CLIENTID: $(mixer_clientid)
   MIXER-CLIENTID: $(mixer_clientid)