Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: build issues

Browse Source
This commit is contained in:
Louis 2025-07-07 18:27:45 +07:00
parent a0be23b500
commit 6b496ae413
No known key found for this signature in database
GPG Key ID: 44FA9F4D33C37DE2
5 changed files with 5 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.devcontainer/buildAppImage.sh
View File

@ -8,7 +8,7 @@ mkdir -p "$TAURI_TOOLKIT_PATH"
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20250213-2/linuxdeploy-x86_64.AppImage -O "$TAURI_TOOLKIT_PATH/linuxdeploy-x86_64.AppImage"
chmod +x "$TAURI_TOOLKIT_PATH/linuxdeploy-x86_64.AppImage"
jq '.bundle.resources = ["resources/pre-install/**/*"] | .bundle.externalBin = ["binaries/cortex-server", "resources/bin/uv"]' ./src-tauri/tauri.conf.json > /tmp/tauri.conf.json
jq '.bundle.resources = ["resources/pre-install/**/*"] | .bundle.externalBin = ["resources/bin/uv"]' ./src-tauri/tauri.conf.json > /tmp/tauri.conf.json
mv /tmp/tauri.conf.json ./src-tauri/tauri.conf.json
make build-tauri

2
.github/workflows/template-tauri-build-linux-x64.yml vendored
View File

@ -104,7 +104,7 @@ jobs:
run: |
echo "Version: ${{ inputs.new_version }}"
# Update tauri.conf.json
jq --arg version "${{ inputs.new_version }}" '.version = $version | .bundle.createUpdaterArtifacts = true | .bundle.resources = ["resources/pre-install/**/*"] | .bundle.externalBin = ["binaries/cortex-server", "resources/bin/uv"]' ./src-tauri/tauri.conf.json > /tmp/tauri.conf.json
jq --arg version "${{ inputs.new_version }}" '.version = $version | .bundle.createUpdaterArtifacts = true | .bundle.resources = ["resources/pre-install/**/*"] | .bundle.externalBin = [ "resources/bin/uv"]' ./src-tauri/tauri.conf.json > /tmp/tauri.conf.json
mv /tmp/tauri.conf.json ./src-tauri/tauri.conf.json
if [ "${{ inputs.channel }}" != "stable" ]; then
jq '.bundle.linux.deb.files = {"usr/bin/bun": "resources/bin/bun",

38
src-tauri/capabilities/default.json
View File

@ -37,43 +37,7 @@
},
{
"identifier": "shell:allow-execute",
"allow": [
{
"args": [
"--start-server",
{
"validator": "\\S+"
},
"--port",
{
"validator": "\\S+"
},
"--config_file_path",
{
"validator": "\\S+"
},
"--data_folder_path",
{
"validator": "\\S+"
},
"--cors",
{
"validator": "\\S+"
},
"--allowed_origins",
{
"validator": "\\S+"
},
"config",
"--api_keys",
{
"validator": "\\S+"
}
],
"name": "binaries/cortex-server",
"sidecar": true
}
]
"allow": []
},
{
"identifier": "opener:allow-open-url",

10
src-tauri/tauri.bundle.windows.nsis.template
View File

@ -636,15 +636,7 @@ Section Install
SetOutPath "$INSTDIR\binaries\engines"
File /nonfatal /a /r "D:\a\jan\jan\src-tauri\binaries\engines\"
SetOutPath $INSTDIR
File /a "/oname=cublas64_12.dll" "D:\a\jan\jan\src-tauri\binaries\cublas64_12.dll"
File /a "/oname=cublasLt64_12.dll" "D:\a\jan\jan\src-tauri\binaries\cublasLt64_12.dll"
File /a "/oname=cudart64_12.dll" "D:\a\jan\jan\src-tauri\binaries\cudart64_12.dll"
File /a "/oname=msvcp140.dll" "D:\a\jan\jan\src-tauri\binaries\msvcp140.dll"
File /a "/oname=vcomp140.dll" "D:\a\jan\jan\src-tauri\binaries\vcomp140.dll"
File /a "/oname=msvcp140_codecvt_ids.dll" "D:\a\jan\jan\src-tauri\binaries\msvcp140_codecvt_ids.dll"
File /a "/oname=vcruntime140_1.dll" "D:\a\jan\jan\src-tauri\binaries\vcruntime140_1.dll"
File /a "/oname=vcruntime140.dll" "D:\a\jan\jan\src-tauri\binaries\vcruntime140.dll"
File /a "/oname=vulkan-1.dll" "D:\a\jan\jan\src-tauri\binaries\vulkan-1.dll"
File /a "/oname=vulkan-1.dll" "D:\a\jan\jan\src-tauri\resources\lib\vulkan-1.dll"
SetOutPath "$INSTDIR\resources\pre-install"
File /nonfatal /a /r "D:\a\jan\jan\src-tauri\resources\pre-install\"
SetOutPath $INSTDIR

6
src-tauri/tauri.conf.json
View File

@ -85,11 +85,7 @@
"icons/icon.icns",
"icons/icon.ico"
],
"resources": [
"resources/pre-install/**/*",
"resources/lib/",
"binaries/**/*"
],
"resources": ["resources/**/*", "binaries/**/*"],
"externalBin": ["resources/bin/bun", "resources/bin/uv"],
"linux": {
"appimage": {