quick patch - not a fix, these will not run
clean up variable declarations and prep for bugsplat sym upload bash variables hate whitespacemaster
parent
386c589885
commit
b6d55cc43b
|
|
@ -14,6 +14,12 @@ env:
|
||||||
EXTRA_ARGS: -DUSE_FMODSTUDIO=ON -DUSE_KDU=ON --crashreporting
|
EXTRA_ARGS: -DUSE_FMODSTUDIO=ON -DUSE_KDU=ON --crashreporting
|
||||||
build_secrets_checkout: ${{github.workspace}}/signing
|
build_secrets_checkout: ${{github.workspace}}/signing
|
||||||
XZ_DEFAULTS: -T0
|
XZ_DEFAULTS: -T0
|
||||||
|
FS_RELEASE_TYPE: Unknown
|
||||||
|
platform: Unknown
|
||||||
|
fallback_platform: ${platform}
|
||||||
|
FS_RELEASE_CHAN: ${FS_RELEASE_TYPE}x64
|
||||||
|
FS_GRID: "GRID FLAGS NOT SET"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build_matrix:
|
build_matrix:
|
||||||
strategy:
|
strategy:
|
||||||
|
|
@ -22,6 +28,9 @@ jobs:
|
||||||
grid: [sl,os]
|
grid: [sl,os]
|
||||||
addrsize: [64]
|
addrsize: [64]
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
outputs:
|
||||||
|
viewer_channel: ${{ steps.channel.outputs.viewer_channel }}
|
||||||
|
viewer_version: ${{ steps.version.outputs.viewer_version }}
|
||||||
steps:
|
steps:
|
||||||
- name: Install Bash 4 and GNU sed on Mac
|
- name: Install Bash 4 and GNU sed on Mac
|
||||||
if: runner.os == 'macOS'
|
if: runner.os == 'macOS'
|
||||||
|
|
@ -38,7 +47,7 @@ jobs:
|
||||||
- uses: actions/setup-python@v4
|
- uses: actions/setup-python@v4
|
||||||
id: py311
|
id: py311
|
||||||
with:
|
with:
|
||||||
python-version: '3.11.6'
|
python-version: '3.11'
|
||||||
cache: 'pip'
|
cache: 'pip'
|
||||||
|
|
||||||
- name: Install python requirements
|
- name: Install python requirements
|
||||||
|
|
@ -90,6 +99,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: find channel from Branch name
|
- name: find channel from Branch name
|
||||||
|
id: channel
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ github.ref_name }}" == Firestorm* ]]; then
|
if [[ "${{ github.ref_name }}" == Firestorm* ]]; then
|
||||||
FS_RELEASE_TYPE=Release
|
FS_RELEASE_TYPE=Release
|
||||||
|
|
@ -110,6 +120,7 @@ jobs:
|
||||||
echo "FS_RELEASE_TYPE=${FS_RELEASE_TYPE}" >> $GITHUB_ENV
|
echo "FS_RELEASE_TYPE=${FS_RELEASE_TYPE}" >> $GITHUB_ENV
|
||||||
echo "FS_RELEASE_CHAN=${FS_RELEASE_CHAN}" >> $GITHUB_ENV
|
echo "FS_RELEASE_CHAN=${FS_RELEASE_CHAN}" >> $GITHUB_ENV
|
||||||
echo "Building for channel ${FS_RELEASE_CHAN}"
|
echo "Building for channel ${FS_RELEASE_CHAN}"
|
||||||
|
viewer_channel=${FS_RELEASE_CHAN}
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Get the code
|
- name: Get the code
|
||||||
|
|
@ -238,9 +249,18 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: build
|
- name: build
|
||||||
|
id: build
|
||||||
run: autobuild build -c ReleaseFS -A${{matrix.addrsize}} --no-configure
|
run: autobuild build -c ReleaseFS -A${{matrix.addrsize}} --no-configure
|
||||||
shell: bash
|
shell: bash
|
||||||
|
- name: Extract version number
|
||||||
|
id: version
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ -r "indra/newview/viewer_version.txt" ]
|
||||||
|
then
|
||||||
|
viewer_version="$(<"$build_dir/newview/viewer_version.txt")"
|
||||||
|
echo "viewer_version=$viewer_version" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
- name: Publish artifacts
|
- name: Publish artifacts
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
|
|
@ -267,31 +287,31 @@ jobs:
|
||||||
path: |
|
path: |
|
||||||
build-darwin-*/newview/*.dmg
|
build-darwin-*/newview/*.dmg
|
||||||
build-darwin-*/newview/*.bz2
|
build-darwin-*/newview/*.bz2
|
||||||
post-windows-symbols:
|
# post-windows-symbols:
|
||||||
needs: build
|
# needs: build_matrix
|
||||||
runs-on: ubuntu-latest
|
# runs-on: ubuntu-latest
|
||||||
steps:
|
# steps:
|
||||||
- name: Post Windows symbols
|
# - name: Post Windows symbols
|
||||||
uses: secondlife/viewer-build-util/post-bugsplat-windows@v1
|
# uses: secondlife/viewer-build-util/post-bugsplat-windows@v1
|
||||||
with:
|
# with:
|
||||||
username: ${{ secrets.BUGSPLAT_USER }}
|
# username: ${{ secrets.BUGSPLAT_USER }}
|
||||||
password: ${{ secrets.BUGSPLAT_PASS }}
|
# password: ${{ secrets.BUGSPLAT_PASS }}
|
||||||
database: "SecondLife_Viewer_2018"
|
# database: "firestorm_release"
|
||||||
channel: ${{ needs.build.outputs.viewer_channel }}
|
# channel: ${{ needs.build_matrix.outputs.viewer_channel }}
|
||||||
version: ${{ needs.build.outputs.viewer_version }}
|
# version: ${{ needs.build_matrix.outputs.viewer_version }}
|
||||||
|
|
||||||
post-mac-symbols:
|
# post-mac-symbols:
|
||||||
needs: build
|
# needs: build_matrix
|
||||||
runs-on: ubuntu-latest
|
# runs-on: ubuntu-latest
|
||||||
steps:
|
# steps:
|
||||||
- name: Post Mac symbols
|
# - name: Post Mac symbols
|
||||||
uses: secondlife/viewer-build-util/post-bugsplat-mac@v1
|
# uses: secondlife/viewer-build-util/post-bugsplat-mac@v1
|
||||||
with:
|
# with:
|
||||||
username: ${{ secrets.BUGSPLAT_USER }}
|
# username: ${{ secrets.BUGSPLAT_USER }}
|
||||||
password: ${{ secrets.BUGSPLAT_PASS }}
|
# password: ${{ secrets.BUGSPLAT_PASS }}
|
||||||
database: "SecondLife_Viewer_2018"
|
# database: "firestorm_release"
|
||||||
channel: ${{ needs.build.outputs.viewer_channel }}
|
# channel: ${{ needs.build_matrix.outputs.viewer_channel }}
|
||||||
version: ${{ needs.build.outputs.viewer_version }}
|
# version: ${{ needs.build_matrix.outputs.viewer_version }}
|
||||||
deploy:
|
deploy:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: build_matrix
|
needs: build_matrix
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue