From 1507db7b1bb8977b50a6906a276c198f7d53a8fd Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Tue, 20 Aug 2019 11:41:22 -0500 Subject: [PATCH] CI: Update CEF on osx to 3770 --- .travis.yml | 2 +- CI/before-deploy-osx.sh | 8 ++++++++ CI/install-dependencies-osx.sh | 2 ++ azure-pipelines.yml | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 939917e7b..adf5abe8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: osx_image: xcode9.4 env: - CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake - - CEF_BUILD_VERSION=3.3282.1726.gc8368c8 + - CEF_BUILD_VERSION=3770 before_install: "./CI/install-dependencies-osx.sh" before_script: "./CI/before-script-osx.sh" before_deploy: "./CI/before-deploy-osx.sh" diff --git a/CI/before-deploy-osx.sh b/CI/before-deploy-osx.sh index 2c1fd69e8..4bb61885d 100755 --- a/CI/before-deploy-osx.sh +++ b/CI/before-deploy-osx.sh @@ -40,10 +40,18 @@ sudo install_name_tool -change \ @rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \ ../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \ OBS.app/Contents/Resources/obs-plugins/obs-browser.so +sudo install_name_tool -change \ + @executable_path/../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \ + ../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \ + OBS.app/Contents/Resources/obs-plugins/obs-browser.so sudo install_name_tool -change \ @rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \ ../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \ OBS.app/Contents/Resources/obs-plugins/obs-browser-page +sudo install_name_tool -change \ + @executable_path/../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \ + ../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \ + OBS.app/Contents/Resources/obs-plugins/obs-browser-page # Package app hr "Generating .pkg" diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index e8dcde0aa..c37d58843 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -12,6 +12,8 @@ set -v if [[ $TRAVIS ]]; then git fetch --unshallow +else + /bin/bash -c "sudo xcode-select -s /Applications/Xcode_9.4.1.app/Contents/Developer" fi # Leave obs-studio folder diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fff2cb93c..e4c3e3efe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,7 @@ variables: CMAKE_PREFIX_PATH: /usr/local/opt/qt5/lib/cmake - CEF_BUILD_VERSION: 3.3282.1726.gc8368c8 + CEF_BUILD_VERSION: 3770 CEF_VERSION: 75.1.16+g16a67c4+chromium-75.0.3770.100 TWITCH-CLIENTID: $(twitch_clientid) TWITCH-HASH: $(twitch_hash)