From 954f44fce9a52eaeeec63ee9fe56cea42bcdd473 Mon Sep 17 00:00:00 2001 From: Paul Peavyhouse Date: Fri, 3 Nov 2023 11:46:17 -0700 Subject: [PATCH 1/2] CI: Fix `pull_request` gh "could not determine current branch" Also updating `.github\workflows\build-project.yaml` with a few of the latest compatible changes in obs-studio's same file. --- .github/workflows/build-project.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml index 556ec4f8..8f29b9a5 100644 --- a/.github/workflows/build-project.yaml +++ b/.github/workflows/build-project.yaml @@ -3,7 +3,7 @@ on: workflow_call: jobs: check-event: - name: Check GitHub Event Data 📡 + name: Check GitHub Event Data 🔎 runs-on: ubuntu-22.04 defaults: run: @@ -29,7 +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 \ + if gh pr view ${{ github.event.number }} --json labels \ | jq -e -r '.labels[] | select(.name == "Seeking Testers")' > /dev/null; then config_data[0]='codesign:true' config_data[2]='package:true' @@ -77,9 +77,9 @@ jobs: if (( ${+RUNNER_DEBUG} )) setopt XTRACE print '::group::Clean Homebrew Environment' - typeset -a to_remove=() + local -a to_remove=() - if (( #to_remove > 0 )) brew uninstall --ignore-dependencies ${to_remove} + if (( #to_remove )) brew uninstall --ignore-dependencies ${to_remove} print '::endgroup::' local product_name @@ -100,7 +100,7 @@ jobs: - name: Set Up Codesigning 🔑 uses: ./.github/actions/setup-macos-codesigning - if: ${{ fromJSON(needs.check-event.outputs.codesign) }} + if: fromJSON(needs.check-event.outputs.codesign) id: codesign with: codesignIdentity: ${{ secrets.MACOS_SIGNING_APPLICATION_IDENTITY }} From e385ac1863b8c658e7f6cc564f04040c9057c9f0 Mon Sep 17 00:00:00 2001 From: Kaito Udagawa Date: Tue, 11 Jul 2023 17:53:02 +0900 Subject: [PATCH 2/2] CI: Fix so installation path on Debian --- .github/scripts/.build.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/scripts/.build.zsh b/.github/scripts/.build.zsh index 4d2f08a0..708fdcf2 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