From af892428a55e01e00d8b43ea9c7ef185be8603dc Mon Sep 17 00:00:00 2001
From: Nguyen Ngoc Minh <91668012+Minh141120@users.noreply.github.com>
Date: Mon, 21 Jul 2025 21:12:14 -0700
Subject: [PATCH] chore: sync make build with dev (#5847)

* chore: sync up make build with dev

* ci: update macOS self-hosted runner
---
 .github/workflows/jan-linter-and-test.yml              | 2 +-
 .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                                               | 5 -----
 mise.toml                                              | 6 +-----
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/jan-linter-and-test.yml b/.github/workflows/jan-linter-and-test.yml
index 97405cc6a..7ad7f67aa 100644
--- a/.github/workflows/jan-linter-and-test.yml
+++ b/.github/workflows/jan-linter-and-test.yml
@@ -71,7 +71,7 @@ jobs:
           path: coverage/lcov.info
 
   test-on-macos:
-    runs-on: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) && 'macos-latest' || 'macos-selfhosted-12-arm64' }}
+    runs-on: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) && 'macos-latest' || 'macos-selfhosted-15-arm64' }}
     if: github.event_name == 'pull_request' || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     steps:
       - name: Getting the repo
diff --git a/.github/workflows/template-tauri-build-linux-x64.yml b/.github/workflows/template-tauri-build-linux-x64.yml
index f79e4fcca..20663ea69 100644
--- a/.github/workflows/template-tauri-build-linux-x64.yml
+++ b/.github/workflows/template-tauri-build-linux-x64.yml
@@ -141,7 +141,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 402712f81..958b7c9f7 100644
--- a/.github/workflows/template-tauri-build-windows-x64.yml
+++ b/.github/workflows/template-tauri-build-windows-x64.yml
@@ -178,7 +178,7 @@ jobs:
       - name: Build app
         shell: bash
         run: |
-          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 b6e1a01b5..77b77022e 100644
--- a/Makefile
+++ b/Makefile
@@ -56,11 +56,6 @@ build: install-and-build
 	yarn download:lib
 	yarn build
 
-# Deprecated soon
-build-tauri: install-and-build
-	yarn download:lib
-	yarn build
-
 clean:
 ifeq ($(OS),Windows_NT)
 	-powershell -Command "Get-ChildItem -Path . -Include node_modules, .next, dist, build, out, .turbo, .yarn -Recurse -Directory | Remove-Item -Recurse -Force"
diff --git a/mise.toml b/mise.toml
index c3c2dae4e..e51fdcce7 100644
--- a/mise.toml
+++ b/mise.toml
@@ -73,12 +73,8 @@ 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"
 ]