fix ubutun

mediar-ai · Nov 21, 2024 · 9ae2e24 · 9ae2e24
1 parent d983302
commit 9ae2e24
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 30 deletions.
diff --git a/.github/workflows/release-app.yml b/.github/workflows/release-app.yml
@@ -206,14 +206,6 @@ jobs:
       #   run: |
       #     pip install mkl mkl-devel mkl-static
 
-      # - name: Install MKL in Linux
-      #   if: matrix.platform == 'ubuntu-22.04'
-      #   run: |
-      #     pip install mkl mkl-devel mkl-static
-      #     mkdir -p /opt/intel/mkl
-      #     cp -rfv ~/.local/lib/* ~/.local/include/* /opt/intel/mkl/
-      #     sudo cp -rfv ~/.local/lib/* /usr/lib/x86_64-linux-gnu/
-
       - name: Install frontend dependencies
         shell: bash
         working-directory: ./screenpipe-app-tauri
@@ -262,10 +254,6 @@ jobs:
             export PKG_CONFIG_ALLOW_CROSS=1
             export RUSTFLAGS="-C link-arg=-Wl,-rpath,@executable_path/../Frameworks -C link-arg=-Wl,-rpath,@loader_path/../Frameworks -C link-arg=-Wl,-install_name,@rpath/libscreenpipe.dylib"
           fi
-          if [[ "${{ matrix.platform }}" == "ubuntu-22.04" ]]; then
-            export PKG_CONFIG_PATH="~/.local/lib/pkgconfig:$PKG_CONFIG_PATH"
-            export MKLROOT="/opt/intel/mkl"
-          fi
           if [[ "${{ matrix.args }}" == "--target x86_64-pc-windows-msvc" ]]; then
             export RUSTFLAGS="-C target-feature=+crt-static"
             export KNF_STATIC_CRT="1"
@@ -291,19 +279,6 @@ jobs:
           docker-images: true
           swap-storage: true
 
-      # - name: Free Disk Space (Windows)
-      #   if: matrix.args == '--target x86_64-pc-windows-msvc'
-      #   run: |
-      #     # Remove unnecessary Windows components
-      #     Get-ChildItem -Path "C:\Windows\SoftwareDistribution\Download\" -Force | Remove-Item -Force -Recurse
-      #     Remove-Item -Path "C:\Windows\Temp\*" -Force -Recurse
-      #     # Clean npm cache
-      #     npm cache clean --force
-      #     # Clean cargo cache
-      #     cargo cache --autoclean
-      #     # Remove unused Windows features
-      #     dism.exe /online /cleanup-image /startcomponentcleanup /resetbase
-
       - name: Build
         uses: tauri-apps/tauri-action@v0
         env:
@@ -321,9 +296,6 @@ jobs:
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           # https://tauri.app/v1/guides/distribution/sign-macos
           CI: true
-          # ubuntu mkl
-          PKG_CONFIG_PATH: ${{ matrix.platform == 'ubuntu-22.04' && '~/.local/lib/pkgconfig:$PKG_CONFIG_PATH' || '' }}
-          MKLROOT: ${{ matrix.platform == 'ubuntu-22.04' && '/opt/intel/mkl' || '' }}
           # Optimize for build speed on Windows
           CARGO_PROFILE_RELEASE_LTO: ${{ matrix.args == '--target x86_64-pc-windows-msvc' && 'thin' || matrix.platform == 'ubuntu-22.04' && 'true' || 'false' }}
           CARGO_PROFILE_RELEASE_OPT_LEVEL: ${{ matrix.args == '--target x86_64-pc-windows-msvc' && '2' || matrix.platform == 'ubuntu-22.04' && 'z' || '3' }}

diff --git a/screenpipe-app-tauri/scripts/pre_build.js b/screenpipe-app-tauri/scripts/pre_build.js
@@ -41,8 +41,7 @@ const config = {
 			'libavfilter-dev',
 			'libavdevice-dev', // FFMPEG
 			'libasound2-dev', // cpal
-			'libxdo-dev',
-			'intel-openmp'
+			'libxdo-dev'
 		],
 	},
 	macos: {