From e6d8e75b65966fb54bc28fab516111718508351d Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Fri, 15 Nov 2024 10:42:07 -0800 Subject: [PATCH 1/2] turning off cuda feature for linux builds (#547) --- .github/workflows/publish.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8fc19950c..cda8a90ed 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -82,15 +82,21 @@ jobs: uses: Jimver/cuda-toolkit@v0.2.18 id: cuda-toolkit # Build stuff - - name: build sidecar (windows/linux) - if: ${{ matrix.platform == 'windows-latest' || startsWith(matrix.platform, 'ubuntu') }} + - name: build sidecar (ubuntu) + if: ${{ startsWith(matrix.platform, 'ubuntu') }} + run: | + mkdir -p apps/tauri/binaries + cargo build -p spyglass --verbose --release; + - name: build sidecar (windows) + if: ${{ startsWith(matrix.platform, 'windows') }} env: CUDA_COMPUTE_CAP: 80 run: | mkdir -p apps/tauri/binaries - cargo build -p spyglass --verbose --release --features cuda; - + - name: copy binaries (windows/ubuntu) + if: ${{ startsWith(matrix.platform, 'windows') || startsWith(matrix.platform, 'ubuntu') }} + run: | cp target/release/spyglass${{ env.target_ext }} apps/tauri/binaries/spyglass-server-${{ env.target_arch }}${{ env.target_ext }} cp target/release/spyglass-debug${{ env.target_ext }} apps/tauri/binaries/spyglass-debug-${{ env.target_arch }}${{ env.target_ext }} cp utils/${{ env.target_os_name }}/pdftotext${{ env.target_ext }} apps/tauri/binaries/pdftotext-${{ env.target_arch }}${{ env.target_ext }} From 0b2f154d86f4486e9b90ea9844ea547bc53d9c1a Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Fri, 15 Nov 2024 11:07:52 -0800 Subject: [PATCH 2/2] updating linux deps in sentry.yml workflow (#548) --- .github/workflows/sentry.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sentry.yml b/.github/workflows/sentry.yml index 0305796b3..7101ef367 100644 --- a/.github/workflows/sentry.yml +++ b/.github/workflows/sentry.yml @@ -40,13 +40,16 @@ jobs: if: matrix.platform == 'ubuntu-24.04' run: | sudo apt-get update - sudo apt-get install -y \ - libgtk-3-dev \ - webkit2gtk-4.0 \ - libappindicator3-dev \ - libayatana-appindicator3-dev \ - librsvg2-dev \ - patchelf + sudo apt install \ + libwebkit2gtk-4.1-dev \ + build-essential \ + curl \ + wget \ + file \ + libxdo-dev \ + libssl-dev \ + libayatana-appindicator3-dev \ + librsvg2-dev # Setup arch targets - linux - name: setup arch target - linux if: ${{startsWith(matrix.platform, 'ubuntu')}}