From 6b2e9ffb7760bd03561049afdb38b583d1c49887 Mon Sep 17 00:00:00 2001 From: Beq Date: Tue, 3 Sep 2024 16:15:58 +0100 Subject: [PATCH 1/2] Linux needs pwsh for the dump-syms... We'll see if installing ti works before we resort to cloning the action and rewriting it to bash --- .github/workflows/build_viewer.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index e400cc0ddc..579566361c 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -203,8 +203,19 @@ jobs: dependencies=("python3-setuptools" "mesa-common-dev" "libgl1-mesa-dev" "libxinerama-dev" "libxrandr-dev" "libpulse-dev" "libglu1-mesa-dev" "libfreetype6-dev" "libfontconfig1") sudo apt-get update sudo apt-get install -y "${dependencies[@]}" + sudo apt-get install -y wget apt-transport-https software-properties-common sudo apt-get autoremove --purge sudo apt-get clean + + - name: Install Microsoft repository GPG keys + if: runner.os == 'Linux' + run: | + wget -q "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb + sudo dpkg -i packages-microsoft-prod.deb + rm packages-microsoft-prod.deb + sudo apt-get update + sudo apt-get install -y powershell + pwsh -c '$PSVersionTable' - name: test macOS bundles are present if: runner.os == 'MacOS' @@ -309,6 +320,7 @@ jobs: run: | npm install -g node-pre-gyp npm install -g node-dump-syms + - name: Post Bugsplat Symbols uses: beqjanus/symbol-upload@main with: From 96ef422551d8359cd1d670bc225468584670f072 Mon Sep 17 00:00:00 2001 From: Beq Date: Tue, 3 Sep 2024 22:11:08 +0100 Subject: [PATCH 2/2] Let's just try Linux without the dumpSyms --- .github/workflows/build_viewer.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml index 579566361c..da55ace014 100644 --- a/.github/workflows/build_viewer.yml +++ b/.github/workflows/build_viewer.yml @@ -315,11 +315,11 @@ jobs: echo "viewer_build=$viewer_build" >> "$GITHUB_OUTPUT" echo "viewer_channel=${{ env.FS_RELEASE_CHAN }}" >> "$GITHUB_OUTPUT" echo "viewer_release_type=${{ env.FS_RELEASE_TYPE }}" >> "$GITHUB_OUTPUT" - - name: Install node-dump-syms - if: runner.os == 'Linux' - run: | - npm install -g node-pre-gyp - npm install -g node-dump-syms + # - name: Install node-dump-syms + # if: runner.os == 'Linux' + # run: | + # npm install -g node-pre-gyp + # npm install -g node-dump-syms - name: Post Bugsplat Symbols uses: beqjanus/symbol-upload@main @@ -350,7 +350,7 @@ jobs: files: ${{ runner.os == 'Windows' && '**/Release/*.{pdb,exe,dll}' || runner.os == 'macOS' && '**/*.xcarchive.zip' || '**/{do-not-run-directly-firestorm-bin,*.sym}' }} directory: "build-*" node-version: "20" - dumpSyms: ${{ runner.os == 'Linux' && 'true' || 'false' }} + dumpSyms: false - name: Publish artifacts if: runner.os == 'Windows' uses: actions/upload-artifact@v4