forked from obsproject/obs-studio
-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #613 from stream-labs/obs_merge_30.2.3
OBS merge 30.2.3
- Loading branch information
Showing
3,019 changed files
with
94,755 additions
and
88,074 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,12 @@ | ||
| # Run the command in the root of the repository to make it take effect: | ||
| # | ||
| # git config blame.ignoreRevsFile .git-blame-ignore-revs | ||
|
|
||
| f53df7da64d2dfc542c24656720b2f47c8957164 | ||
| f8e00d6071ea1426f7f30055016cc7c3d080d64e | ||
| 1739272c4453ac005d315c2e22f43e119561435b | ||
| dcc07cfe4ed3f7fb60c7a0d1563236eac0a0b053 | ||
| 593664dcdb11951d2538bd78d6620b03ca95392a | ||
| 64139a6bbd6f85155c709035d82e91f52c2e36fe | ||
| 7628265099724671a1682f6b298b509d2fa23855 | ||
| f4733ec6a26bac21699daf3dfd6857ff5a1d3c07 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| name: Set Up and Build obs-studio | ||
| description: Builds obs-studio for specified architecture and build config | ||
| inputs: | ||
| target: | ||
| description: Build target for obs-studio | ||
| required: true | ||
| config: | ||
| description: Build configuration | ||
| required: false | ||
| default: RelWithDebInfo | ||
| codesign: | ||
| description: Enable codesigning (macOS only) | ||
| required: false | ||
| default: 'false' | ||
| codesignIdent: | ||
| description: Developer ID for application codesigning (macOS only) | ||
| required: false | ||
| default: '-' | ||
| codesignTeam: | ||
| description: Team ID for application codesigning (macOS only) | ||
| required: false | ||
| default: '' | ||
| provisioningProfileUUID: | ||
| description: UUID of provisioning profile (macOS only) | ||
| required: false | ||
| default: '' | ||
| 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 --no-rcs --errexit --pipefail {0} | ||
| working-directory: ${{ inputs.workingDirectory }} | ||
| env: | ||
| CODESIGN_IDENT: ${{ inputs.codesignIdent }} | ||
| CODESIGN_TEAM: ${{ inputs.codesignTeam }} | ||
| PROVISIONING_PROFILE: ${{ inputs.provisioningProfileUUID }} | ||
| run: | | ||
| : Run macOS Build | ||
| local -a build_args=( | ||
| --config ${{ inputs.config }} | ||
| --target macos-${{ inputs.target }} | ||
| ) | ||
| if (( ${+RUNNER_DEBUG} )) build_args+=(--debug) | ||
| if [[ '${{ inputs.codesign }}' == true ]] build_args+=(--codesign) | ||
| git fetch origin --no-tags --no-recurse-submodules -q | ||
| .github/scripts/build-macos ${build_args} | ||
| - name: Install Dependencies 🛍️ | ||
| if: runner.os == 'Linux' | ||
| shell: bash | ||
| run: | | ||
| : Install Dependencies 🛍️ | ||
| echo ::group::Install Dependencies | ||
| eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" | ||
| echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH | ||
| brew install --quiet zsh | ||
| echo ::endgroup:: | ||
| - name: Run Ubuntu Build | ||
| if: runner.os == 'Linux' | ||
| shell: zsh --no-rcs --errexit --pipefail {0} | ||
| working-directory: ${{ inputs.workingDirectory }} | ||
| run: | | ||
| : Run Ubuntu Build | ||
| local -a build_args=( | ||
| --config ${{ inputs.config }} | ||
| --target ubuntu-${{ inputs.target }} | ||
| ) | ||
| if (( ${+RUNNER_DEBUG} )) build_args+=(--debug) | ||
| git fetch origin --no-tags --no-recurse-submodules -q | ||
| .github/scripts/build-ubuntu ${build_args} | ||
| - name: Run Windows Build | ||
| if: runner.os == 'Windows' | ||
| shell: pwsh | ||
| working-directory: ${{ inputs.workingDirectory }} | ||
| run: | | ||
| # Run Windows Build | ||
| $BuildArgs = @{ | ||
| Target = '${{ inputs.target }}' | ||
| Configuration = '${{ inputs.config }}' | ||
| } | ||
| if ( $Env:RUNNER_DEBUG -ne $null ) { | ||
| $BuildArgs += @{ Debug = $true } | ||
| } | ||
| git fetch origin --no-tags --no-recurse-submodules -q | ||
| .github/scripts/Build-Windows.ps1 @BuildArgs | ||
| - name: Create Summary 📊 | ||
| if: contains(fromJSON('["Linux", "macOS"]'), runner.os) | ||
| shell: zsh --no-rcs --errexit --pipefail {0} | ||
| run: | | ||
| : Create Summary 📊 | ||
| local -a ccache_data | ||
| if (( ${+RUNNER_DEBUG} )) { | ||
| setopt XTRACE | ||
| ccache_data=("${(fA)$(ccache -s -vv)}") | ||
| } else { | ||
| ccache_data=("${(fA)$(ccache -s)}") | ||
| } | ||
| print '### ${{ runner.os }} Ccache Stats (${{ inputs.target }})' >> $GITHUB_STEP_SUMMARY | ||
| print '```' >> $GITHUB_STEP_SUMMARY | ||
| for line (${ccache_data}) { | ||
| print ${line} >> $GITHUB_STEP_SUMMARY | ||
| } | ||
| print '```' >> $GITHUB_STEP_SUMMARY |
Oops, something went wrong.