livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build.yaml: Fix FROM_FORK value, ReleaseOS PR builds (#2147)

master
Signal Linden 2024-07-30 10:09:49 -07:00 committed by GitHub
parent 0c70d3c616
commit dfa7d60a72
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build.yaml vendored
View File

@ -22,6 +22,7 @@ jobs:
# important to ensure it's the empty string when false. If you omit || '', # important to ensure it's the empty string when false. If you omit || '',
# its value when false is "false", which is interpreted as true. # 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' || '' }} 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: steps:
- name: Set Variables - name: Set Variables
id: setvar id: setvar

19
build.sh
View File

@ -146,12 +146,21 @@ pre_build()
&& [ -r "$master_message_template_checkout/message_template.msg" ] \ && [ -r "$master_message_template_checkout/message_template.msg" ] \
&& template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$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 RELEASE_CRASH_REPORTING=OFF
HAVOK=ON HAVOK=OFF
SIGNING=() SIGNING=()
if [[ "$arch" == "Darwin" && "$variant" == "Release" ]] if [[ "$variant" != *OS ]]
then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \ then
"-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.") # 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 fi
if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ] if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ]