Skip to content

Commit 95c4db3

Browse files
WizardCMWizardCM
committed
CI: Fix CEF version for both Linux & macOS
1 parent bb6b1e5 commit 95c4db3

4 files changed

+19
-18
lines changed

‎CI/before-script-linux.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
set -ex
44
ccache -s || echo "CCache is not available."
55
mkdir build && cd build
6-
cmake -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="../cef_binary_${CEF_BUILD_VERSION}_linux64" ..
6+
cmake -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="../cef_binary_${LINUX_CEF_BUILD_VERSION}_linux64" ..

‎CI/full-build-macos.sh

+14-14
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
# -h: Print usage help
2222
#
2323
# Environment Variables (optional):
24-
# MACOS_DEPS_VERSION : Pre-compiled macOS dependencies version
25-
# CEF_BUILD_VERSION : Chromium Embedded Framework version
26-
# VLC_VERISON : VLC version
27-
# SPARKLE_VERSION : Sparke Framework version
28-
# BUILD_DIR : Alternative directory to build OBS in
24+
# MACOS_DEPS_VERSION : Pre-compiled macOS dependencies version
25+
# MACOS_CEF_BUILD_VERSION : Chromium Embedded Framework version
26+
# VLC_VERISON : VLC version
27+
# SPARKLE_VERSION : Sparke Framework version
28+
# BUILD_DIR : Alternative directory to build OBS in
2929
#
3030
##############################################################################
3131

@@ -52,7 +52,7 @@ NPROC="${NPROC:-$(sysctl -n hw.ncpu)}"
5252
BUILD_DEPS=(
5353
"obs-deps ${MACOS_DEPS_VERSION:-${CI_DEPS_VERSION}}"
5454
"qt-deps ${QT_VERSION:-${CI_QT_VERSION}} ${MACOS_DEPS_VERSION:-${CI_DEPS_VERSION}}"
55-
"cef ${CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}"
55+
"cef ${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}"
5656
"vlc ${VLC_VERSION:-${CI_VLC_VERSION}}"
5757
"sparkle ${SPARKLE_VERSION:-${CI_SPARKLE_VERSION}}"
5858
)
@@ -218,7 +218,7 @@ install_cef() {
218218
cd ./cef_binary_${1}_macosx64
219219
step "Fix tests..."
220220
/usr/bin/sed -i '.orig' '/add_subdirectory(tests\/ceftests)/d' ./CMakeLists.txt
221-
/usr/bin/sed -i '.orig' 's/"'$(test "${CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 && echo "10.9" || echo "10.10")'"/"'${MIN_MACOS_VERSION:-${CI_MIN_MACOS_VERSION}}'"/' ./cmake/cef_variables.cmake
221+
/usr/bin/sed -i '.orig' 's/"'$(test "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 && echo "10.9" || echo "10.10")'"/"'${MIN_MACOS_VERSION:-${CI_MIN_MACOS_VERSION}}'"/' ./cmake/cef_variables.cmake
222222
ensure_dir ./build
223223
step "Run CMAKE..."
224224
cmake \
@@ -278,9 +278,9 @@ configure_obs_build() {
278278
-DDepsPath="/tmp/obsdeps" \
279279
-DVLCPath="${DEPS_BUILD_DIR}/vlc-${VLC_VERSION:-${CI_VLC_VERSION}}" \
280280
-DBUILD_BROWSER=ON \
281-
-DBROWSER_LEGACY="$(test "${CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 && echo "ON" || echo "OFF")" \
281+
-DBROWSER_LEGACY="$(test "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 && echo "ON" || echo "OFF")" \
282282
-DWITH_RTMPS=ON \
283-
-DCEF_ROOT_DIR="${DEPS_BUILD_DIR}/cef_binary_${CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}_macosx64" \
283+
-DCEF_ROOT_DIR="${DEPS_BUILD_DIR}/cef_binary_${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}_macosx64" \
284284
-DCMAKE_BUILD_TYPE="${BUILD_CONFIG}" \
285285
..
286286

@@ -329,7 +329,7 @@ bundle_dylibs() {
329329
./OBS.app/Contents/PlugIns/text-freetype2.so
330330
./OBS.app/Contents/PlugIns/obs-outputs.so
331331
)
332-
if ! [ "${CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
332+
if ! [ "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
333333
${CI_SCRIPTS}/app/dylibbundler -cd -of -a ./OBS.app -q -f \
334334
-s ./OBS.app/Contents/MacOS \
335335
-s "${DEPS_BUILD_DIR}/sparkle/Sparkle.framework" \
@@ -371,7 +371,7 @@ install_frameworks() {
371371

372372
hr "Adding Chromium Embedded Framework"
373373
step "Copy Framework..."
374-
/bin/cp -R "${DEPS_BUILD_DIR}/cef_binary_${CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}_macosx64/Release/Chromium Embedded Framework.framework" ./OBS.app/Contents/Frameworks/
374+
/bin/cp -R "${DEPS_BUILD_DIR}/cef_binary_${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}_macosx64/Release/Chromium Embedded Framework.framework" ./OBS.app/Contents/Frameworks/
375375
}
376376

377377
prepare_macos_bundle() {
@@ -394,7 +394,7 @@ prepare_macos_bundle() {
394394
/bin/cp rundir/${BUILD_CONFIG}/bin/obs ./OBS.app/Contents/MacOS
395395
/bin/cp rundir/${BUILD_CONFIG}/bin/obs-ffmpeg-mux ./OBS.app/Contents/MacOS
396396
/bin/cp rundir/${BUILD_CONFIG}/bin/libobsglad.0.dylib ./OBS.app/Contents/MacOS
397-
if ! [ "${CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
397+
if ! [ "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
398398
/bin/cp -R "rundir/${BUILD_CONFIG}/bin/OBS Helper.app" "./OBS.app/Contents/Frameworks/OBS Helper.app"
399399
/bin/cp -R "rundir/${BUILD_CONFIG}/bin/OBS Helper (GPU).app" "./OBS.app/Contents/Frameworks/OBS Helper (GPU).app"
400400
/bin/cp -R "rundir/${BUILD_CONFIG}/bin/OBS Helper (Plugin).app" "./OBS.app/Contents/Frameworks/OBS Helper (Plugin).app"
@@ -523,7 +523,7 @@ codesign_bundle() {
523523
/usr/bin/codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib"
524524
/usr/bin/codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib"
525525
/usr/bin/codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib"
526-
if ! [ "${CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
526+
if ! [ "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
527527
/usr/bin/codesign --force --options runtime --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/libvk_swiftshader.dylib"
528528
fi
529529
/usr/bin/codesign --force --options runtime --sign "${CODESIGN_IDENT}" --deep "./OBS.app/Contents/Frameworks/Chromium Embedded Framework.framework"
@@ -540,7 +540,7 @@ codesign_bundle() {
540540
/usr/bin/codesign --force --options runtime --entitlements "${CI_SCRIPTS}/app/entitlements.plist" --sign "${CODESIGN_IDENT}" --deep ./OBS.app
541541
/bin/echo -n "${COLOR_RESET}"
542542

543-
if ! [ "${CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
543+
if ! [ "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
544544
step "Code-sign CEF helper apps..."
545545
/bin/echo -n "${COLOR_ORANGE}"
546546
/usr/bin/codesign --force --options runtime --sign "${CODESIGN_IDENT}" --deep "./OBS.app/Contents/Frameworks/OBS Helper.app"

‎CI/install-dependencies-linux.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ sudo apt-get install -y \
4848
v4l2loopback-dkms
4949

5050
# build cef
51-
wget --quiet --retry-connrefused --waitretry=1 https://cdn-fastly.obsproject.com/downloads/cef_binary_${CEF_BUILD_VERSION}_linux64.tar.bz2
52-
tar -xjf ./cef_binary_${CEF_BUILD_VERSION}_linux64.tar.bz2
51+
wget --quiet --retry-connrefused --waitretry=1 https://cdn-fastly.obsproject.com/downloads/cef_binary_${LINUX_CEF_BUILD_VERSION}_linux64.tar.bz2
52+
tar -xjf ./cef_binary_${LINUX_CEF_BUILD_VERSION}_linux64.tar.bz2

‎azure-pipelines.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
variables:
44
CMAKE_PREFIX_PATH: /usr/local/opt/qt5/lib/cmake
5-
CEF_BUILD_VERSION: 3770
5+
MACOS_CEF_BUILD_VERSION: 4183
6+
LINUX_CEF_BUILD_VERSION: 3770
67
CEF_VERSION: 75.1.16+g16a67c4+chromium-75.0.3770.100
78
TWITCH-CLIENTID: $(twitch_clientid)
89
TWITCH-HASH: $(twitch_hash)

0 commit comments

Comments
 (0)