jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: Switch to universal Qt builds for CI 

Due to changes on obs-deps, per-arch Qt builds do not contain universal
binaries anymore. To allow CI to cross-compile on x86_64 runners,
the universal release is used, which will run on both architectures.
master
PatTheMav 2022-07-07 20:08:47 +02:00 committed by Ryan Foster
parent 64efcd155d
commit c887459f3c
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/main.yml vendored
View File

@ -21,6 +21,7 @@ env:
QT_VERSION_MAC: '5.15.2'
QT_HASH_MAC_X86_64: 'eb52d5cad6160a333db0781490f703822688f94cbf75bf753116761653b657ca'
QT_HASH_MAC_ARM64: '8e0f614310e8686b10ff780050caac94ae4bc3ee9e3534e3ccf2300d59088ad0'
QT_HASH_MAC_UNIVERSAL: 'b62b8d4069278356ad70ae49ed8eb5cb1722b108cd1975e329779be6f998a098'
QT_VERSION_WIN: '5.15.2'
DEPS_VERSION_MAC: '2022-05-23'
DEPS_HASH_MAC_X86_64: 'e0372850e2c1014301d8a121945ff4778b543f3a768ccfdeda02c3427572cbc3'

1
CI/include/build_support_macos.sh
View File

@ -20,6 +20,7 @@ CI_SPARKLE_HASH=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+SPARKLE_H
CI_QT_VERSION=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+QT_VERSION_MAC: '([0-9\.]+)'/\1/p" | /usr/bin/head -1)
CI_QT_HASH_X86_64=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+QT_HASH_MAC_X86_64: '([0-9a-f]+)'/\1/p")
CI_QT_HASH_ARM64=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+QT_HASH_MAC_ARM64: '([0-9a-f]+)'/\1/p")
CI_QT_HASH_UNIVERSAL=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+QT_HASH_MAC_UNIVERSAL: '([0-9a-f]+)'/\1/p")
CI_MACOSX_DEPLOYMENT_TARGET_X86_64=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+MACOSX_DEPLOYMENT_TARGET_X86_64: '([0-9\.]+)'/\1/p")
CI_MACOSX_DEPLOYMENT_TARGET_ARM64=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+MACOSX_DEPLOYMENT_TARGET_ARM64: '([0-9\.]+)'/\1/p")
CI_MACOS_CEF_VERSION=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+CEF_BUILD_VERSION_MAC: '([0-9]+)'/\1/p")

13
CI/macos/01_install_dependencies.sh
View File

@ -26,10 +26,19 @@ install_qt-deps() {
status "Set up precompiled dependency Qt v${1}"
ensure_dir "${DEPS_BUILD_DIR}"
step "Download..."
check_and_fetch "https://github.com/obsproject/obs-deps/releases/download/${1}/macos-deps-qt-${1}-${ARCH:-x86_64}.tar.xz" "${2}"
if [[ -n ${CI} ]]; then
_ARCH='universal'
_HASH=${CI_QT_HASH_UNIVERSAL}
else
_ARCH="${ARCH:-x86_64}"
_HASH="${2}"
fi
check_and_fetch "https://github.com/obsproject/obs-deps/releases/download/${1}/macos-deps-qt-${1}-${_ARCH}.tar.xz" "${_HASH}"
mkdir -p obs-deps
step "Unpack..."
/usr/bin/tar -xf "./macos-deps-qt-${1}-${ARCH:-x86_64}.tar.xz" -C ./obs-deps
/usr/bin/tar -xf "./macos-deps-qt-${1}-${_ARCH}.tar.xz" -C ./obs-deps
/usr/bin/xattr -r -d com.apple.quarantine ./obs-deps
}