diff options
| author | Signal Linden <signal@lindenlab.com> | 2024-07-30 10:09:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-30 10:09:49 -0700 |
| commit | dfa7d60a72fbf2705d0240dd73ca78ddda5db56d (patch) | |
| tree | 459cd11b5842b55e29ca9cba636fc837fc07312b | |
| parent | 0c70d3c616320ae6e3f22935b0fd997133b0e0ec (diff) | |
build.yaml: Fix FROM_FORK value, ReleaseOS PR builds (#2147)
| -rw-r--r-- | .github/workflows/build.yaml | 1 | ||||
| -rwxr-xr-x | build.sh | 19 |
2 files changed, 15 insertions, 5 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b385e3ba12..fd3b1e0e0a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,6 +22,7 @@ jobs: # important to ensure it's the empty string when false. If you omit || '', # its value when false is "false", which is interpreted as true. RELEASE_RUN: ${{ (github.event.inputs.release_run || github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life')) && 'Y' || '' }} + FROM_FORK: ${{ github.event.pull_request.head.repo.organization != 'secondlife' }} steps: - name: Set Variables id: setvar @@ -146,12 +146,21 @@ pre_build() && [ -r "$master_message_template_checkout/message_template.msg" ] \ && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg" - RELEASE_CRASH_REPORTING=ON - HAVOK=ON + RELEASE_CRASH_REPORTING=OFF + HAVOK=OFF SIGNING=() - if [[ "$arch" == "Darwin" && "$variant" == "Release" ]] - then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \ - "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.") + if [[ "$variant" != *OS ]] + then + # Proprietary builds + + RELEASE_CRASH_REPORTING=ON + HAVOK=ON + + if [[ "$arch" == "Darwin" ]] + then + SIGNING=("-DENABLE_SIGNING:BOOL=YES" \ + "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.") + fi fi if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ] |