diff --git a/.github/scripts/.build.zsh b/.github/scripts/.build.zsh index 4d2f08a..708fdcf 100755 --- a/.github/scripts/.build.zsh +++ b/.github/scripts/.build.zsh @@ -242,6 +242,7 @@ ${_usage_host:-}" -G "${generator}" -DQT_VERSION=${QT_VERSION:-6} -DCMAKE_BUILD_TYPE=${config} + -DCMAKE_INSTALL_PREFIX=/usr ) local cmake_version diff --git a/.github/scripts/.package.zsh b/.github/scripts/.package.zsh index 076d897..6ed9e56 100755 --- a/.github/scripts/.package.zsh +++ b/.github/scripts/.package.zsh @@ -180,13 +180,23 @@ ${_usage_host:-}" if (( _loglevel > 1 || ${+CI} )) _tarflags="v${_tarflags}" if (( package )) { - if [[ ! -f ${project_root}/release/${config}/${product_name}.pkg ]] { - log_error 'Installer Package not found. Run the build script or the CMake build and install procedures first.' + if [[ ! -f ${project_root}/build_macos/Distribution.generated.xml ]] { + log_error 'Distribution file not found. Run the build script or the CMake build and install procedures first.' return 2 } log_group "Packaging ${product_name}..." pushd ${project_root} + pkgbuild \ + --component "${project_root}/release/${config}/${product_name}.plugin" \ + --install-location "/Library/Application Support/obs-studio/plugins" \ + --scripts "${project_root}/cmake/macos/resources/scripts" \ + "${project_root}/release/${config}/${product_name}-flat.pkg" + productbuild \ + --distribution "${project_root}/build_macos/Distribution.generated.xml" \ + --package-path "${project_root}/release/${config}" \ + "${project_root}/release/${config}/${product_name}.pkg" + rm "${project_root}/release/${config}/${product_name}-flat.pkg" if (( codesign )) { read_codesign_installer diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml index 556ec4f..c5fc116 100644 --- a/.github/workflows/build-project.yaml +++ b/.github/workflows/build-project.yaml @@ -29,8 +29,7 @@ jobs: case "${GITHUB_EVENT_NAME}" in pull_request) config_data=('codesign:false' 'notarize:false' 'package:false' 'config:RelWithDebInfo') - if gh pr view --json labels \ - | jq -e -r '.labels[] | select(.name == "Seeking Testers")' > /dev/null; then + if [[ ${{ contains(github.event.pull_request.labels.*.name, 'Seeking Testers') }} = true ]]; then config_data[0]='codesign:true' config_data[2]='package:true' fi