From 71df55c8152ccc9d092702d39a16ed66a92eaa07 Mon Sep 17 00:00:00 2001 From: tt2468 Date: Mon, 1 Aug 2022 21:07:35 -0700 Subject: [PATCH] CI, CMakeLists: Upgrade to new CMake --- .github/actions/build-plugin/action.yml | 77 ++ .github/actions/package-plugin/action.yml | 99 ++ .github/scripts/.Aptfile | 9 + .github/scripts/.Brewfile | 6 + .github/scripts/.Wingetfile | 3 + .github/scripts/.build.zsh | 245 +++++ .github/scripts/.package.zsh | 192 ++++ .github/scripts/Build-Windows.ps1 | 101 ++ .github/scripts/Package-Windows.ps1 | 92 ++ .github/scripts/build-linux.sh | 13 + .github/scripts/build-linux.zsh | 1 + .github/scripts/build-macos.zsh | 1 + .github/scripts/check-changes.sh | 11 + .github/scripts/check-cmake.sh | 44 + .github/scripts/check-format.sh | 55 ++ .github/scripts/package-linux.sh | 13 + .github/scripts/package-linux.zsh | 1 + .github/scripts/package-macos.zsh | 1 + .github/scripts/utils.pwsh/Check-Git.ps1 | 25 + .../scripts/utils.pwsh/Ensure-Location.ps1 | 29 + .../scripts/utils.pwsh/Expand-ArchiveExt.ps1 | 70 ++ .../utils.pwsh/Install-BuildDependencies.ps1 | 60 ++ .../scripts/utils.pwsh/Invoke-External.ps1 | 40 + .../scripts/utils.pwsh/Invoke-GitCheckout.ps1 | 117 +++ .github/scripts/utils.pwsh/Logger.ps1 | 123 +++ .github/scripts/utils.pwsh/Setup-Host.ps1 | 103 ++ .github/scripts/utils.pwsh/Setup-Obs.ps1 | 84 ++ .github/scripts/utils.zsh/check_linux | 36 + .github/scripts/utils.zsh/check_macos | 20 + .github/scripts/utils.zsh/check_packages | 52 + .github/scripts/utils.zsh/check_xcnotary | 9 + .github/scripts/utils.zsh/log_debug | 3 + .github/scripts/utils.zsh/log_error | 3 + .github/scripts/utils.zsh/log_info | 7 + .github/scripts/utils.zsh/log_output | 7 + .github/scripts/utils.zsh/log_status | 7 + .github/scripts/utils.zsh/log_warning | 5 + .github/scripts/utils.zsh/mkcd | 1 + .github/scripts/utils.zsh/read_codesign | 7 + .../scripts/utils.zsh/read_codesign_installer | 7 + .github/scripts/utils.zsh/read_codesign_pass | 33 + .github/scripts/utils.zsh/read_codesign_user | 7 + .github/scripts/utils.zsh/set_loglevel | 17 + .github/scripts/utils.zsh/setup_ccache | 14 + .github/scripts/utils.zsh/setup_linux | 62 ++ .github/scripts/utils.zsh/setup_macos | 127 +++ .github/scripts/utils.zsh/setup_obs | 122 +++ .github/workflows/main.yml | 393 ++++++++ CI/generate-docs.sh | 31 - CI/linux/build-plugin-ubuntu.sh | 9 - CI/linux/install-dependencies-ubuntu.sh | 29 - CI/linux/package-plugin-ubuntu.sh | 24 - CI/macos/Brewfile | 5 - CI/macos/build-plugin-macos.sh | 27 - CI/macos/install-build-obs-macos.sh | 39 - CI/macos/install-dependencies-macos.sh | 57 -- CI/macos/obs-websocket.pkgproj | 726 -------------- CI/macos/package-plugin-macos.sh | 89 -- CI/windows/download-obs-deps.cmd | 7 - CI/windows/install-qt-win.cmd | 8 - CI/windows/package-plugin-windows.cmd | 12 - CI/windows/prepare-obs-windows.cmd | 38 - CI/windows/prepare-plugin-windows.cmd | 7 - CMakeLists.txt | 276 ++---- azure-pipelines.yml | 200 ---- buildspec.json | 83 ++ cmake/ObsPluginHelpers.cmake | 506 ++++++++++ cmake/bundle/macos/Plugin-Info.plist.in | 26 + cmake/bundle/macos/entitlements.plist | 17 + cmake/bundle/macos/installer-macos.pkgproj.in | 920 ++++++++++++++++++ cmake/bundle/windows/installer-Windows.iss.in | 63 ++ external/FindLibObs.cmake | 107 -- installer/installer-windows.generated.iss | 74 ++ src/Utils.cpp | 3 +- src/WSRequestHandler_Recording.cpp | 37 +- src/obs-websocket.cpp | 6 - src/obs-websocket.h | 17 - 77 files changed, 4349 insertions(+), 1648 deletions(-) create mode 100644 .github/actions/build-plugin/action.yml create mode 100644 .github/actions/package-plugin/action.yml create mode 100644 .github/scripts/.Aptfile create mode 100644 .github/scripts/.Brewfile create mode 100644 .github/scripts/.Wingetfile create mode 100755 .github/scripts/.build.zsh create mode 100755 .github/scripts/.package.zsh create mode 100644 .github/scripts/Build-Windows.ps1 create mode 100644 .github/scripts/Package-Windows.ps1 create mode 100755 .github/scripts/build-linux.sh create mode 120000 .github/scripts/build-linux.zsh create mode 120000 .github/scripts/build-macos.zsh create mode 100755 .github/scripts/check-changes.sh create mode 100755 .github/scripts/check-cmake.sh create mode 100755 .github/scripts/check-format.sh create mode 100755 .github/scripts/package-linux.sh create mode 120000 .github/scripts/package-linux.zsh create mode 120000 .github/scripts/package-macos.zsh create mode 100644 .github/scripts/utils.pwsh/Check-Git.ps1 create mode 100644 .github/scripts/utils.pwsh/Ensure-Location.ps1 create mode 100644 .github/scripts/utils.pwsh/Expand-ArchiveExt.ps1 create mode 100644 .github/scripts/utils.pwsh/Install-BuildDependencies.ps1 create mode 100644 .github/scripts/utils.pwsh/Invoke-External.ps1 create mode 100644 .github/scripts/utils.pwsh/Invoke-GitCheckout.ps1 create mode 100644 .github/scripts/utils.pwsh/Logger.ps1 create mode 100644 .github/scripts/utils.pwsh/Setup-Host.ps1 create mode 100644 .github/scripts/utils.pwsh/Setup-Obs.ps1 create mode 100644 .github/scripts/utils.zsh/check_linux create mode 100644 .github/scripts/utils.zsh/check_macos create mode 100644 .github/scripts/utils.zsh/check_packages create mode 100644 .github/scripts/utils.zsh/check_xcnotary create mode 100644 .github/scripts/utils.zsh/log_debug create mode 100644 .github/scripts/utils.zsh/log_error create mode 100644 .github/scripts/utils.zsh/log_info create mode 100644 .github/scripts/utils.zsh/log_output create mode 100644 .github/scripts/utils.zsh/log_status create mode 100644 .github/scripts/utils.zsh/log_warning create mode 100644 .github/scripts/utils.zsh/mkcd create mode 100644 .github/scripts/utils.zsh/read_codesign create mode 100644 .github/scripts/utils.zsh/read_codesign_installer create mode 100644 .github/scripts/utils.zsh/read_codesign_pass create mode 100644 .github/scripts/utils.zsh/read_codesign_user create mode 100644 .github/scripts/utils.zsh/set_loglevel create mode 100644 .github/scripts/utils.zsh/setup_ccache create mode 100644 .github/scripts/utils.zsh/setup_linux create mode 100644 .github/scripts/utils.zsh/setup_macos create mode 100644 .github/scripts/utils.zsh/setup_obs create mode 100644 .github/workflows/main.yml delete mode 100755 CI/generate-docs.sh delete mode 100755 CI/linux/build-plugin-ubuntu.sh delete mode 100755 CI/linux/install-dependencies-ubuntu.sh delete mode 100755 CI/linux/package-plugin-ubuntu.sh delete mode 100644 CI/macos/Brewfile delete mode 100755 CI/macos/build-plugin-macos.sh delete mode 100755 CI/macos/install-build-obs-macos.sh delete mode 100755 CI/macos/install-dependencies-macos.sh delete mode 100644 CI/macos/obs-websocket.pkgproj delete mode 100755 CI/macos/package-plugin-macos.sh delete mode 100644 CI/windows/download-obs-deps.cmd delete mode 100644 CI/windows/install-qt-win.cmd delete mode 100644 CI/windows/package-plugin-windows.cmd delete mode 100644 CI/windows/prepare-obs-windows.cmd delete mode 100644 CI/windows/prepare-plugin-windows.cmd delete mode 100644 azure-pipelines.yml create mode 100644 buildspec.json create mode 100644 cmake/ObsPluginHelpers.cmake create mode 100644 cmake/bundle/macos/Plugin-Info.plist.in create mode 100644 cmake/bundle/macos/entitlements.plist create mode 100644 cmake/bundle/macos/installer-macos.pkgproj.in create mode 100644 cmake/bundle/windows/installer-Windows.iss.in delete mode 100644 external/FindLibObs.cmake create mode 100644 installer/installer-windows.generated.iss diff --git a/.github/actions/build-plugin/action.yml b/.github/actions/build-plugin/action.yml new file mode 100644 index 00000000..1e91d155 --- /dev/null +++ b/.github/actions/build-plugin/action.yml @@ -0,0 +1,77 @@ +name: 'Setup and build plugin' +description: 'Builds the plugin for specified architecture and build config.' +inputs: + target: + description: 'Build target for dependencies' + required: true + config: + description: 'Build configuration' + required: false + default: 'Release' + codesign: + description: 'Enable codesigning (macOS only)' + required: false + default: 'false' + codesignIdent: + description: 'Developer ID for application codesigning (macOS only)' + required: false + default: '-' + visualStudio: + description: 'Visual Studio version (Windows only)' + required: false + default: 'Visual Studio 16 2019' + workingDirectory: + description: 'Working directory for packaging' + required: false + default: ${{ github.workspace }} +runs: + using: 'composite' + steps: + - name: Run macOS Build + if: ${{ runner.os == 'macOS' }} + shell: zsh {0} + env: + CODESIGN_IDENT: ${{ inputs.codesignIdent }} + run: | + build_args=( + -c ${{ inputs.config }} + -t macos-${{ inputs.target }} + ) + + if [[ '${{ inputs.codesign }}' == 'true' ]] build_args+=(-s) + if (( ${+CI} && ${+RUNNER_DEBUG} )) build_args+=(--debug) + + ${{ inputs.workingDirectory }}/.github/scripts/build-macos.zsh ${build_args} + + - name: Run Linux Build + if: ${{ runner.os == 'Linux' }} + shell: bash + run: | + build_args=( + -c ${{ inputs.config }} + -t linux-${{ inputs.target }} + ) + + if [[ -n "${CI}" && -n "${RUNNER_DEBUG}" ]]; then + build_args+=(--debug) + fi + + ${{ inputs.workingDirectory }}/.github/scripts/build-linux.sh "${build_args[@]}" + + - name: Run Windows Build + if: ${{ runner.os == 'Windows' }} + shell: pwsh + run: | + $BuildArgs = @{ + Target = '${{ inputs.target }}' + Configuration = '${{ inputs.config }}' + CMakeGenerator = '${{ inputs.visualStudio }}' + } + + if ( ( Test-Path env:CI ) -and ( Test-Path env:RUNNER_DEBUG ) ) { + $BuildArgs += @{ + Debug = $true + } + } + + ${{ inputs.workingDirectory }}/.github/scripts/Build-Windows.ps1 @BuildArgs diff --git a/.github/actions/package-plugin/action.yml b/.github/actions/package-plugin/action.yml new file mode 100644 index 00000000..094803e2 --- /dev/null +++ b/.github/actions/package-plugin/action.yml @@ -0,0 +1,99 @@ +name: 'Package plugin' +description: 'Packages the plugin for specified architecture and build config.' +inputs: + target: + description: 'Build target for dependencies' + required: true + config: + description: 'Build configuration' + required: false + default: 'Release' + codesign: + description: 'Enable codesigning (macOS only)' + required: false + default: 'false' + notarize: + description: 'Enable notarization (macOS only)' + required: false + default: 'false' + codesignIdent: + description: 'Developer ID for application codesigning (macOS only)' + required: false + default: '-' + installerIdent: + description: 'Developer ID for installer package codesigning (macOS only)' + required: false + default: '' + codesignUser: + description: 'Apple ID username for notarization (macOS only)' + required: false + default: '' + codesignPass: + description: 'Apple ID password for notarization (macOS only)' + required: false + default: '' + createInstaller: + description: 'Create InnoSetup installer (Windows only)' + required: false + default: 'false' + workingDirectory: + description: 'Working directory for packaging' + required: false + default: ${{ github.workspace }} +runs: + using: 'composite' + steps: + - name: Run macOS packaging + if: ${{ runner.os == 'macOS' }} + shell: zsh {0} + env: + CODESIGN_IDENT: ${{ inputs.codesignIdent }} + CODESIGN_IDENT_INSTALLER: ${{ inputs.installerIdent }} + CODESIGN_IDENT_USER: ${{ inputs.codesignUser }} + CODESIGN_IDENT_PASS: ${{ inputs.codesignPass }} + run: | + package_args=( + -c ${{ inputs.config }} + -t macos-${{ inputs.target }} + ) + + if [[ '${{ inputs.codesign }}' == 'true' ]] package_args+=(-s) + if [[ '${{ inputs.notarize }}' == 'true' ]] package_args+=(-n) + if (( ${+CI} && ${+RUNNER_DEBUG} )) build_args+=(--debug) + + ${{ inputs.workingDirectory }}/.github/scripts/package-macos.zsh ${package_args} + + - name: Run Linux packaging + if: ${{ runner.os == 'Linux' }} + shell: bash + run: | + package_args=( + -c ${{ inputs.config }} + -t linux-${{ inputs.target }} + ) + if [[ -n "${CI}" && -n "${RUNNER_DEBUG}" ]]; then + build_args+=(--debug) + fi + + ${{ inputs.workingDirectory }}/.github/scripts/package-linux.sh "${package_args[@]}" + + - name: Run Windows packaging + if: ${{ runner.os == 'Windows' }} + shell: pwsh + run: | + $PackageArgs = @{ + Target = '${{ inputs.target }}' + Configuration = '${{ inputs.config }}' + } + + if ( '${{ inputs.createInstaller }}' -eq 'true' ) { + $PackageArgs += @{BuildInstaller = $true} + } + + if ( ( Test-Path env:CI ) -and ( Test-Path env:RUNNER_DEBUG ) ) { + $BuildArgs += @{ + Debug = $true + } + } + + ${{ inputs.workingDirectory }}/.github/scripts/Package-Windows.ps1 @PackageArgs diff --git a/.github/scripts/.Aptfile b/.github/scripts/.Aptfile new file mode 100644 index 00000000..59196f02 --- /dev/null +++ b/.github/scripts/.Aptfile @@ -0,0 +1,9 @@ +package 'cmake' +package 'ccache' +package 'curl' +package 'git' +package 'jq' +package 'ninja-build', bin: 'ninja' +package 'pkg-config' +package 'clang' +package 'clang-format-13' diff --git a/.github/scripts/.Brewfile b/.github/scripts/.Brewfile new file mode 100644 index 00000000..6990ecf4 --- /dev/null +++ b/.github/scripts/.Brewfile @@ -0,0 +1,6 @@ +brew "ccache" +brew "coreutils" +brew "cmake" +brew "git" +brew "jq" +brew "ninja" diff --git a/.github/scripts/.Wingetfile b/.github/scripts/.Wingetfile new file mode 100644 index 00000000..4e7c46e4 --- /dev/null +++ b/.github/scripts/.Wingetfile @@ -0,0 +1,3 @@ +package '7zip.7zip', path: '7-zip', bin: '7z' +package 'cmake', path: 'Cmake\bin', bin: 'cmake' +package 'innosetup', path: 'Inno Setup 6', bin: 'iscc' diff --git a/.github/scripts/.build.zsh b/.github/scripts/.build.zsh new file mode 100755 index 00000000..80c520da --- /dev/null +++ b/.github/scripts/.build.zsh @@ -0,0 +1,245 @@ +#!/usr/bin/env zsh + +builtin emulate -L zsh +setopt EXTENDED_GLOB +setopt PUSHD_SILENT +setopt ERR_EXIT +setopt ERR_RETURN +setopt NO_UNSET +setopt PIPE_FAIL +setopt NO_AUTO_PUSHD +setopt NO_PUSHD_IGNORE_DUPS +setopt FUNCTION_ARGZERO + +## Enable for script debugging +# setopt WARN_CREATE_GLOBAL +# setopt WARN_NESTED_VAR +# setopt XTRACE + +autoload -Uz is-at-least && if ! is-at-least 5.2; then + print -u2 -PR "%F{1}${funcstack[1]##*/}:%f Running on Zsh version %B${ZSH_VERSION}%b, but Zsh %B5.2%b is the minimum supported version. Upgrade Zsh to fix this issue." + exit 1 +fi + +_trap_error() { + print -u2 -PR '%F{1} ✖︎ script execution error%f' + print -PR -e " + Callstack: + ${(j:\n :)funcfiletrace} + " + exit 2 +} + +build() { + if (( ! ${+SCRIPT_HOME} )) typeset -g SCRIPT_HOME=${ZSH_ARGZERO:A:h} + local host_os=${${(s:-:)ZSH_ARGZERO:t:r}[2]} + local target="${host_os}-${CPUTYPE}" + local project_root=${SCRIPT_HOME:A:h:h} + local buildspec_file="${project_root}/buildspec.json" + + trap '_trap_error' ZERR + + fpath=("${SCRIPT_HOME}/utils.zsh" ${fpath}) + autoload -Uz log_info log_error log_output set_loglevel check_${host_os} setup_${host_os} setup_obs setup_ccache + + if [[ ! -r ${buildspec_file} ]] { + log_error \ + 'No buildspec.json found. Please create a build specification for your project.' \ + 'A buildspec.json.template file is provided in the repository to get you started.' + return 2 + } + + typeset -g -a skips=() + local -i _verbosity=1 + local -r _version='1.0.0' + local -r -a _valid_targets=( + macos-x86_64 + macos-arm64 + macos-universal + linux-x86_64 + ) + local -r -a _valid_configs=(Debug RelWithDebInfo Release MinSizeRel) + if [[ ${host_os} == 'macos' ]] { + local -r -a _valid_generators=(Xcode Ninja 'Unix Makefiles') + } else { + local -r -a _valid_generators=(Ninja 'Unix Makefiles') + } + local generator='Ninja' + local -r _usage=" +Usage: %B${functrace[1]%:*}%b