diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 91dc95443..dac1ad625 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -100,6 +100,35 @@ jobs: name: windows-zip path: target/release/volta-windows.zip + windows-arm: + name: Build - Windows ARM + runs-on: windows-latest + steps: + - name: Check out code + uses: actions/checkout@v4 + - name: Set up cargo + uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + target: aarch64-pc-windows-msvc + - name: Add cargo-wix subcommand + run: cargo install cargo-wix + - name: Compile and package installer + run: | + cargo wix --nocapture --package volta --target aarch64-pc-windows-msvc --output target\wix\volta-windows-arm.msi + - name: Create zip of binaries + run: powershell Compress-Archive volta*.exe volta-windows-arm.zip + working-directory: ./target/aarch64-pc-windows-msvc/release + - name: Upload installer + uses: actions/upload-artifact@v4 + with: + name: windows-installer-arm + path: target/wix/volta-windows-arm.msi + - name: Upload zip + uses: actions/upload-artifact@v4 + with: + name: windows-zip-arm + path: target/aarch64-pc-windows-msvc/release/volta-windows-arm.zip + release: name: Publish release runs-on: ubuntu-latest @@ -107,6 +136,7 @@ jobs: - linux - macos - windows + - windows-arm if: github.event_name == 'push' steps: - name: Check out code @@ -141,6 +171,16 @@ jobs: with: name: windows-zip path: release + - name: Fetch Windows ARM installer + uses: actions/download-artifact@v4 + with: + name: windows-installer-arm + path: release + - name: Fetch Windows ARM zip + uses: actions/download-artifact@v4 + with: + name: windows-zip-arm + path: release - name: Show release artifacts run: ls -la release - name: Create draft release @@ -197,6 +237,24 @@ jobs: asset_path: ./release/volta-windows.zip asset_name: volta-${{ steps.release_info.outputs.version }}-windows.zip asset_content_type: application/zip + - name: Upload Windows ARM installer + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./release/volta-windows-arm.msi + asset_name: volta-${{ steps.release_info.outputs.version }}-windows-arm64.msi + asset_content_type: application/x-msi + - name: Upload Windows ARM zip + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./release/volta-windows-arm.zip + asset_name: volta-${{ steps.release_info.outputs.version }}-windows-arm64.zip + asset_content_type: application/zip - name: Upload manifest file uses: actions/upload-release-asset@v1 env: diff --git a/wix/main.wxs b/wix/main.wxs index 2bbad0eba..2f4b827af 100644 --- a/wix/main.wxs +++ b/wix/main.wxs @@ -21,11 +21,9 @@ destination for 32-bit versus 64-bit installers. Removal of these lines will cause installation errors. --> - - + - @@ -44,12 +42,11 @@ Keywords='Installer' Description='The JavaScript Launcher' Manufacturer='The Volta Maintainers' - InstallerVersion='450' + InstallerVersion='500' Languages='1033' Compressed='yes' InstallScope='perMachine' - SummaryCodepage='1252' - Platform='$(var.Platform)'/> + SummaryCodepage='1252'/> + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + +