refactor: standardize build process and remove build-tauri target (#5846)
This commit is contained in:
parent
5241557a74
commit
e82e5e1da9
@ -143,7 +143,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
- name: Build app
|
- name: Build app
|
||||||
run: |
|
run: |
|
||||||
make build-tauri
|
make build
|
||||||
|
|
||||||
APP_IMAGE=./src-tauri/target/release/bundle/appimage/$(ls ./src-tauri/target/release/bundle/appimage/ | grep AppImage | head -1)
|
APP_IMAGE=./src-tauri/target/release/bundle/appimage/$(ls ./src-tauri/target/release/bundle/appimage/ | grep AppImage | head -1)
|
||||||
yarn tauri signer sign \
|
yarn tauri signer sign \
|
||||||
|
|||||||
@ -168,7 +168,7 @@ jobs:
|
|||||||
- name: Build app
|
- name: Build app
|
||||||
run: |
|
run: |
|
||||||
rustup target add x86_64-apple-darwin
|
rustup target add x86_64-apple-darwin
|
||||||
make build-tauri
|
make build
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
APP_PATH: '.'
|
APP_PATH: '.'
|
||||||
|
|||||||
@ -181,7 +181,7 @@ jobs:
|
|||||||
curl -L -o ./src-tauri/binaries/vcomp140.dll https://catalog.jan.ai/vcomp140.dll
|
curl -L -o ./src-tauri/binaries/vcomp140.dll https://catalog.jan.ai/vcomp140.dll
|
||||||
curl -L -o ./src-tauri/binaries/msvcp140_codecvt_ids.dll https://catalog.jan.ai/msvcp140_codecvt_ids.dll
|
curl -L -o ./src-tauri/binaries/msvcp140_codecvt_ids.dll https://catalog.jan.ai/msvcp140_codecvt_ids.dll
|
||||||
ls ./src-tauri/binaries
|
ls ./src-tauri/binaries
|
||||||
make build-tauri
|
make build
|
||||||
env:
|
env:
|
||||||
AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }}
|
AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }}
|
||||||
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
|
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
|
||||||
|
|||||||
4
Makefile
4
Makefile
@ -49,10 +49,6 @@ build-and-publish: install-and-build
|
|||||||
|
|
||||||
# Build
|
# Build
|
||||||
build: install-and-build
|
build: install-and-build
|
||||||
yarn build
|
|
||||||
|
|
||||||
# Deprecated soon
|
|
||||||
build-tauri: install-and-build
|
|
||||||
yarn copy:lib
|
yarn copy:lib
|
||||||
yarn build
|
yarn build
|
||||||
|
|
||||||
|
|||||||
@ -77,11 +77,6 @@ run = [
|
|||||||
[tasks.build]
|
[tasks.build]
|
||||||
description = "Build complete application (matches Makefile)"
|
description = "Build complete application (matches Makefile)"
|
||||||
depends = ["install-and-build"]
|
depends = ["install-and-build"]
|
||||||
run = "yarn build"
|
|
||||||
|
|
||||||
[tasks.build-tauri]
|
|
||||||
description = "Build Tauri application (DEPRECATED - matches Makefile)"
|
|
||||||
depends = ["install-and-build"]
|
|
||||||
run = [
|
run = [
|
||||||
"yarn copy:lib",
|
"yarn copy:lib",
|
||||||
"yarn build"
|
"yarn build"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user