Merge branch 'main' into release

spyglass-search · Nov 15, 2024 · e223bc1 · e223bc1
2 parents 8c9d8ce + 0b2f154
commit e223bc1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -82,15 +82,21 @@ jobs:
         uses: Jimver/[email protected]
         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 }}

diff --git 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')}}