From 5843100b9e24e4ff566c2050b9ce9727e8434d23 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Wed, 1 Mar 2017 12:22:41 -0600 Subject: [PATCH] CI: OSX - Use bash variable for CEF version --- CI/before-script-osx.sh | 2 +- CI/install-dependencies-osx.sh | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CI/before-script-osx.sh b/CI/before-script-osx.sh index 32f6f9f8a..a8c3e96c4 100755 --- a/CI/before-script-osx.sh +++ b/CI/before-script-osx.sh @@ -1,3 +1,3 @@ mkdir build cd build -cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_3.2987.1588.g1952835_macosx64 .. +cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_$CEF_BUILD_VERSION_macosx64 .. diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index 45279ece8..d6ee545e4 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -1,6 +1,8 @@ # Exit if something fails set -e +CEF_BUILD_VERSION=3.2987.1588.g1952835 + git fetch --tags # Leave obs-studio folder @@ -30,9 +32,9 @@ mkdir ./sparkle tar -xf ./sparkle.tar.bz2 -C ./sparkle # CEF Stuff -curl -kLO https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_3.2987.1588.g1952835_macosx64.tar.bz2 -f --retry 5 -C - -tar -xf ./cef_binary_3.2987.1588.g1952835_macosx64.tar.bz2 -cd ./cef_binary_3.2987.1588.g1952835_macosx64 +curl -kLO https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_$CEF_BUILD_VERSION_macosx64.tar.bz2 -f --retry 5 -C - +tar -xf ./cef_binary_$CEF_BUILD_VERSION_macosx64.tar.bz2 +cd ./cef_binary_$CEF_BUILD_VERSION_macosx64 mkdir build cd ./build cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 .. -- GitLab