build.yaml: Fix FROM_FORK value, ReleaseOS PR builds (#2147)
parent
0c70d3c616
commit
dfa7d60a72
|
|
@ -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
|
||||
|
|
|
|||
15
build.sh
15
build.sh
|
|
@ -146,13 +146,22 @@ 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=OFF
|
||||
HAVOK=OFF
|
||||
SIGNING=()
|
||||
if [[ "$variant" != *OS ]]
|
||||
then
|
||||
# Proprietary builds
|
||||
|
||||
RELEASE_CRASH_REPORTING=ON
|
||||
HAVOK=ON
|
||||
SIGNING=()
|
||||
if [[ "$arch" == "Darwin" && "$variant" == "Release" ]]
|
||||
then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
|
||||
|
||||
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" ]
|
||||
then
|
||||
|
|
|
|||
Loading…
Reference in New Issue