diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index d0a6255abf..790d3d8a56 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 - id: py312 + id: py311 with: python-version: '3.11.6' cache: 'pip' @@ -267,6 +267,31 @@ jobs: path: | build-darwin-*/newview/*.dmg build-darwin-*/newview/*.bz2 + post-windows-symbols: + needs: build + runs-on: ubuntu-latest + steps: + - name: Post Windows symbols + uses: secondlife/viewer-build-util/post-bugsplat-windows@v1 + with: + username: ${{ secrets.BUGSPLAT_USER }} + password: ${{ secrets.BUGSPLAT_PASS }} + database: "SecondLife_Viewer_2018" + channel: ${{ needs.build.outputs.viewer_channel }} + version: ${{ needs.build.outputs.viewer_version }} + + post-mac-symbols: + needs: build + runs-on: ubuntu-latest + steps: + - name: Post Mac symbols + uses: secondlife/viewer-build-util/post-bugsplat-mac@v1 + with: + username: ${{ secrets.BUGSPLAT_USER }} + password: ${{ secrets.BUGSPLAT_PASS }} + database: "SecondLife_Viewer_2018" + channel: ${{ needs.build.outputs.viewer_channel }} + version: ${{ needs.build.outputs.viewer_version }} deploy: runs-on: ubuntu-latest needs: build_matrix diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index 1255293d54..6b2111506a 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -594,6 +594,11 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then echo "Setting startup project via vstool" ../indra/tools/vstool/VSTool.exe --solution Firestorm.sln --startup firestorm-bin --workingdir firestorm-bin "..\\..\\indra\\newview" --config $BTYPE fi + # Check the return code of the build command + if [ $? -ne 0 ]; then + echo "Configure failed!" + exit 1 + fi fi if [ $WANTS_BUILD -eq $TRUE ] ; then echo "Building $TARGET_PLATFORM..." @@ -625,6 +630,12 @@ if [ $WANTS_BUILD -eq $TRUE ] ; then -verbosity:normal -toolsversion:15.0 -p:"VCBuildAdditionalOptions= /incremental" fi fi + # Check the return code of the build command + if [ $? -ne 0 ]; then + echo "Build failed!" + exit 1 + fi fi echo "finished" +exit 0