diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ed832eaa..ea56c39f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,15 +16,23 @@ jobs: include: - artifact-name: Windows-x86_64 os: windows-2022 + tauri-build-flags: + + - artifact-name: Windows-aarch64 + os: windows-2022 + tauri-build-flags: -- --target aarch64-pc-windows-msvc - artifact-name: macOS-x86_64 os: macOS-13 + tauri-build-flags: - artifact-name: macOS-arm64 os: macOS-14 + tauri-build-flags: - artifact-name: Linux-x86_64 os: ubuntu-latest + tauri-build-flags: name: "${{ matrix.artifact-name }}" runs-on: ${{ matrix.os }} @@ -50,8 +58,12 @@ jobs: run: npm install continue-on-error: true + - name: Set up Windows aarch64 Rust compiler + if: matrix.artifact-name == 'Windows-aarch64' + run: rustup target install aarch64-pc-windows-msvc + - name: Build package - run: npm run tauri build + run: npm run tauri build ${{ matrix.tauri-build-flags }} - name: Upload bundle (Windows) if: startsWith(matrix.os, 'windows') @@ -96,10 +108,14 @@ jobs: - name: Display structure of downloaded files run: ls -R - - name: Rename Windows-x86_64 bundle + - name: Rename Windows x86_64 bundle working-directory: pkg/Windows-x86_64/release/bundle/nsis run: mv *.exe Choreo-${{ github.ref_name }}-Windows-x86_64.exe + - name: Rename Windows aarch64 bundle + working-directory: pkg/Windows-aarch64/release/bundle/nsis + run: mv *.exe Choreo-${{ github.ref_name }}-Windows-aarch64.exe + - name: Rename macOS x86_64 bundle working-directory: pkg/macOS-x86_64/release/bundle/dmg run: mv *.dmg Choreo-${{ github.ref_name }}-macOS-x86_64.dmg diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index a21a05f71..d872730e0 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3175,7 +3175,7 @@ dependencies = [ [[package]] name = "trajoptlib" version = "0.1.0" -source = "git+https://github.com/SleipnirGroup/TrajoptLib.git?rev=3e2826bf5455adef7af1437cf56524f101aa0eed#3e2826bf5455adef7af1437cf56524f101aa0eed" +source = "git+https://github.com/SleipnirGroup/TrajoptLib.git?rev=733a4c0b72e83947b3c92a96544429aa09237328#733a4c0b72e83947b3c92a96544429aa09237328" dependencies = [ "cmake", "cxx", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index b2e386416..7a5c80bfd 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -18,7 +18,7 @@ tauri-build = { version = "1.5.1", features = [] } tauri = { version = "1.6.0", features = [ "window-close", "window-set-title", "path-all", "dialog", "dialog-confirm", "dialog-save", "dialog-open", "dialog-ask", "fs-all", "shell-open", "devtools"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -trajoptlib = { git = "https://github.com/SleipnirGroup/TrajoptLib.git", rev = "3e2826bf5455adef7af1437cf56524f101aa0eed", features = ["sleipnir"] } +trajoptlib = { git = "https://github.com/SleipnirGroup/TrajoptLib.git", rev = "733a4c0b72e83947b3c92a96544429aa09237328", features = ["sleipnir"] } open = "3" [features]