From 05888fc3aae084aaf41c551aca39dc593c726f56 Mon Sep 17 00:00:00 2001 From: Gol-D-Ace Date: Fri, 30 Aug 2019 16:05:33 +0200 Subject: [PATCH] CI: Update Windows CEF version --- CI/install-script-win.cmd | 12 ++++++------ appveyor.yml | 6 +++--- azure-pipelines.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CI/install-script-win.cmd b/CI/install-script-win.cmd index a3051c3d9..196e0eef9 100644 --- a/CI/install-script-win.cmd +++ b/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 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 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 DepsPath64=%CD%\dependencies2017\win64 set VLCPath=%CD%\vlc set QTDIR32=C:\QtDep\5.10.1\msvc2017 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 mkdir build build32 build64 if "%TWITCH-CLIENTID%"=="$(twitch_clientid)" ( diff --git a/appveyor.yml b/appveyor.yml index aa698b2ea..e650672a3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ image: environment: 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 TWITCH-CLIENTID: secure: D3vFGk41HZaJWAZu5slwAHZhB868mGI2aIMS03L2rt4= @@ -43,8 +43,8 @@ test: off cache: - dependencies2017.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 notifications: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 45fcdaf41..fff2cb93c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,7 +3,7 @@ variables: CMAKE_PREFIX_PATH: /usr/local/opt/qt5/lib/cmake 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-HASH: $(twitch_hash) MIXER-CLIENTID: $(mixer_clientid)