From e82e5e1da945c3fd25848d1b401359f4e05c26d8 Mon Sep 17 00:00:00 2001 From: Nguyen Ngoc Minh <91668012+Minh141120@users.noreply.github.com> Date: Mon, 21 Jul 2025 10:01:48 -0700 Subject: [PATCH] refactor: standardize build process and remove build-tauri target (#5846) --- .github/workflows/template-tauri-build-linux-x64.yml | 2 +- .github/workflows/template-tauri-build-macos.yml | 2 +- .github/workflows/template-tauri-build-windows-x64.yml | 2 +- Makefile | 4 ---- mise.toml | 5 ----- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/template-tauri-build-linux-x64.yml b/.github/workflows/template-tauri-build-linux-x64.yml index e2ce4d841..39a649b03 100644 --- a/.github/workflows/template-tauri-build-linux-x64.yml +++ b/.github/workflows/template-tauri-build-linux-x64.yml @@ -143,7 +143,7 @@ jobs: fi - name: Build app 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) yarn tauri signer sign \ diff --git a/.github/workflows/template-tauri-build-macos.yml b/.github/workflows/template-tauri-build-macos.yml index 2679638c4..40cf4e839 100644 --- a/.github/workflows/template-tauri-build-macos.yml +++ b/.github/workflows/template-tauri-build-macos.yml @@ -168,7 +168,7 @@ jobs: - name: Build app run: | rustup target add x86_64-apple-darwin - make build-tauri + make build env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} APP_PATH: '.' diff --git a/.github/workflows/template-tauri-build-windows-x64.yml b/.github/workflows/template-tauri-build-windows-x64.yml index a2ce5a39a..d6b15ca14 100644 --- a/.github/workflows/template-tauri-build-windows-x64.yml +++ b/.github/workflows/template-tauri-build-windows-x64.yml @@ -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/msvcp140_codecvt_ids.dll https://catalog.jan.ai/msvcp140_codecvt_ids.dll ls ./src-tauri/binaries - make build-tauri + make build env: AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }} AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} diff --git a/Makefile b/Makefile index 7754b0d3e..a381fffa3 100644 --- a/Makefile +++ b/Makefile @@ -49,10 +49,6 @@ build-and-publish: install-and-build # Build build: install-and-build - yarn build - -# Deprecated soon -build-tauri: install-and-build yarn copy:lib yarn build diff --git a/mise.toml b/mise.toml index 86a90f742..1e32a9da9 100644 --- a/mise.toml +++ b/mise.toml @@ -77,11 +77,6 @@ run = [ [tasks.build] description = "Build complete application (matches Makefile)" depends = ["install-and-build"] -run = "yarn build" - -[tasks.build-tauri] -description = "Build Tauri application (DEPRECATED - matches Makefile)" -depends = ["install-and-build"] run = [ "yarn copy:lib", "yarn build"