Skip to content

Commit

Permalink
Windows builds 2 (BloopAI#714)
Browse files Browse the repository at this point in the history
* Revert "Revert use of pre-built `ort` (BloopAI#684)"

This reverts commit 34cb629.

* update tauri, add dylibs to frameworks

* remove dylib from resources

* Set ort runtime path in flake.nix

* Remove infinite loop

* Separate frameworks

* Take care of macos flake

* Bounded wait

* Adjust gitignore

* Review changes on build.rs

* Raise timeout

* Keep hacking

* Eyeye quality

* Use existing caches

* Use lld as linker

* Pin tauri action version

* Last known-good

* Upgrade deps

* !?!?!

* Remove toolchain?

---------

Co-authored-by: anastasiia <anastasiya1155@gmail.com>
  • Loading branch information
rsdy and anastasiya1155 committed Jul 4, 2023
1 parent 80318fb commit e0a6739
Show file tree
Hide file tree
Showing 197 changed files with 496 additions and 1,151 deletions.
253 changes: 13 additions & 240 deletions .gitattributes

Large diffs are not rendered by default.

125 changes: 0 additions & 125 deletions .github/workflows/dependencies.yml

This file was deleted.

10 changes: 1 addition & 9 deletions .github/workflows/tauri-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,6 @@ jobs:
profile: minimal
target: ${{ matrix.target }}

- uses: Swatinem/rust-cache@v2
with:
prefix-key: "bloop-tauri-release-1"

- name: Run tests
run: |
cargo --locked test --verbose --release -p bloop
- name: Check if Segment key exists
env:
segment_key: ${{ secrets.ANALYTICS_FE_WRITE_KEY_PROD }}
Expand Down Expand Up @@ -103,7 +95,7 @@ jobs:
id: release-version
run: echo "RELEASE_VERSION=$(cat apps/desktop/src-tauri/tauri.conf.json | jq '.package.version' | tr -d '"')" >> "$GITHUB_OUTPUT"

- uses: tauri-apps/tauri-action@dev
- uses: tauri-apps/tauri-action@cb58ba3f65bd456ee564376585a8400bf0b71f47
env:
ORT_LIB_LOCATION: ${{ github.workspace }}/lib/${{ matrix.target }}/onnxruntime
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@ playwright-report

# local config
/local_config.json

apps/desktop/src-tauri/dylibs/*.so
apps/desktop/src-tauri/dylibs/*.dll
apps/desktop/src-tauri/frameworks/*.dylib
3 changes: 3 additions & 0 deletions .taurignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
server/bleep/bleep.db*
apps/desktop/src-tauri/dylibs/*.so
apps/desktop/src-tauri/dylibs/*.dylib
apps/desktop/src-tauri/dylibs/*.dll
Loading

0 comments on commit e0a6739

Please sign in to comment.