diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f2dfafd..85d3c1f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,12 +16,13 @@ jobs: fail-fast: false matrix: include: - - platform: "macos-latest" # for Arm based macs (M1 and above). - args: "--target aarch64-apple-darwin" - - platform: "macos-latest" # for Intel based macs. - args: "--target x86_64-apple-darwin" - - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04. - args: "" + # disable other platforms for now + # - platform: "macos-latest" # for Arm based macs (M1 and above). + # args: "--target aarch64-apple-darwin" + # - platform: "macos-latest" # for Intel based macs. + # args: "--target x86_64-apple-darwin" + # - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04. + # args: "" - platform: "windows-latest" args: "" @@ -49,7 +50,7 @@ jobs: # You can remove the one that doesn't apply to your app to speed up the workflow a bit. - name: install frontend dependencies - run: yarn install # change this to npm, pnpm or bun depending on which one you use. + run: npm install # change this to npm, pnpm or bun depending on which one you use. - uses: tauri-apps/tauri-action@v0 env: diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 427e882..ebf3fd2 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -10,12 +10,13 @@ jobs: fail-fast: false matrix: include: - - platform: "macos-latest" # for Arm based macs (M1 and above). - args: "--target aarch64-apple-darwin" - - platform: "macos-latest" # for Intel based macs. - args: "--target x86_64-apple-darwin" - - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04. - args: "" + # disable other platforms for now + # - platform: "macos-latest" # for Arm based macs (M1 and above). + # args: "--target aarch64-apple-darwin" + # - platform: "macos-latest" # for Intel based macs. + # args: "--target x86_64-apple-darwin" + # - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04. + # args: "" - platform: "windows-latest" args: "" @@ -25,8 +26,6 @@ jobs: - name: setup node uses: actions/setup-node@v4 - with: - node-version: lts/* - name: install Rust stable uses: dtolnay/rust-toolchain@stable @@ -43,7 +42,7 @@ jobs: # You can remove the one that doesn't apply to your app to speed up the workflow a bit. - name: install frontend dependencies - run: yarn install # change this to npm, pnpm or bun depending on which one you use. + run: npm install # change this to npm, pnpm or bun depending on which one you use. # If tagName and releaseId are omitted tauri-action will only build the app and won't try to upload any assets. - uses: tauri-apps/tauri-action@v0 diff --git a/bun.lockb b/bun.lockb new file mode 100644 index 0000000..7897e15 Binary files /dev/null and b/bun.lockb differ diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index a1d1d57..6d5951d 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -3,9 +3,9 @@ "version": "0.0.0", "identifier": "com.maplecreator.io", "build": { - "beforeDevCommand": "bun run dev", + "beforeDevCommand": "npm run dev", "devUrl": "http://localhost:1420", - "beforeBuildCommand": "bun run build", + "beforeBuildCommand": "npm run build", "frontendDist": "../dist" }, "app": {