Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build in beforeBuildCommand back #59

Closed
wants to merge 2 commits into from
Closed

Build in beforeBuildCommand back #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1592e8
Build in `beforeBuildCommand` back in as https://github.com/tauri-app…
philipborg Feb 25, 2022
064c912
Merge branch 'master' into windows-build-cmd
philipborg Jul 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ jobs:
- name: Install Tauri
run: cargo install tauri-cli --locked --version ${{ env.TAURI_CLI_VERSION }}

- name: Windows CMD workaround
run: trunk build --release --dist "./../src-tauri/websrc"
if: runner.os == 'Windows'
working-directory: "${{ env.SOURCE_PATH }}/cube_shuffle-wasm"
- name: Tauri Build
run: cargo tauri build ${{ runner.os == 'macOS' && '--target universal-apple-darwin' || '' }} || true
working-directory: "${{ env.SOURCE_PATH }}/src-tauri"
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.windows.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"build": {
"beforeBuildCommand": "echo https://github.com/tauri-apps/tauri/pull/3334"
"beforeBuildCommand": "rmdir \"src-tauri\\websrc\" /s /q && mkdir \"src-tauri\\websrc\" && cd \"cube_shuffle-wasm\" && trunk build --release --dist \".\\..\\src-tauri\\websrc\""
}
}