diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index 790d3d8a56..6e4f51bc8d 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -9,11 +9,17 @@ on: - "*preview" schedule: - cron: '00 03 * * *' # Run every day at 3am UTC -env: +env: AUTOBUILD_VARIABLES_FILE: ${{github.workspace}}/build-variables/variables EXTRA_ARGS: -DUSE_FMODSTUDIO=ON -DUSE_KDU=ON --crashreporting build_secrets_checkout: ${{github.workspace}}/signing 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: build_matrix: strategy: @@ -22,6 +28,9 @@ jobs: grid: [sl,os] addrsize: [64] runs-on: ${{ matrix.os }} + outputs: + viewer_channel: ${{ steps.channel.outputs.viewer_channel }} + viewer_version: ${{ steps.version.outputs.viewer_version }} steps: - name: Install Bash 4 and GNU sed on Mac if: runner.os == 'macOS' @@ -38,7 +47,7 @@ jobs: - uses: actions/setup-python@v4 id: py311 with: - python-version: '3.11.6' + python-version: '3.11' cache: 'pip' - name: Install python requirements @@ -90,6 +99,7 @@ jobs: shell: bash - name: find channel from Branch name + id: channel run: | if [[ "${{ github.ref_name }}" == Firestorm* ]]; then FS_RELEASE_TYPE=Release @@ -110,6 +120,7 @@ jobs: echo "FS_RELEASE_TYPE=${FS_RELEASE_TYPE}" >> $GITHUB_ENV echo "FS_RELEASE_CHAN=${FS_RELEASE_CHAN}" >> $GITHUB_ENV echo "Building for channel ${FS_RELEASE_CHAN}" + viewer_channel=${FS_RELEASE_CHAN} shell: bash - name: Get the code @@ -238,9 +249,18 @@ jobs: shell: bash - name: build + id: build run: autobuild build -c ReleaseFS -A${{matrix.addrsize}} --no-configure 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 if: runner.os == 'Windows' uses: actions/upload-artifact@v3 @@ -267,31 +287,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 }} + # post-windows-symbols: + # needs: build_matrix + # 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: "firestorm_release" + # channel: ${{ needs.build_matrix.outputs.viewer_channel }} + # version: ${{ needs.build_matrix.outputs.viewer_version }} + + # post-mac-symbols: + # needs: build_matrix + # 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: "firestorm_release" + # channel: ${{ needs.build_matrix.outputs.viewer_channel }} + # version: ${{ needs.build_matrix.outputs.viewer_version }} deploy: runs-on: ubuntu-latest needs: build_matrix