From 4552a73f8676cece2363c788f995753de9cc1ae0 Mon Sep 17 00:00:00 2001 From: Kayh Date: Sun, 15 Sep 2024 19:51:19 -0400 Subject: [PATCH] ci fixes --- .github/workflows/build-windows.yml | 7 +++---- deploy/default.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index daa054150..192971b62 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -35,12 +35,12 @@ jobs: targets: x86_64-pc-windows-msvc - run: cargo install cargo-component + - run: cargo install cargo-wix - run: cargo install wac-cli - - run: cargo install wix - name: Build package run: | - cargo wix -p ${{ matrix.package }} --release --target x86_64-pc-windows-msvc + cargo wix -p ${{ matrix.package }} --target x86_64-pc-windows-msvc mkdir result mv target/x86_64-pc-windows-msvc/release/*.exe result cp crates/${{ matrix.package }}/README.md result @@ -52,8 +52,7 @@ jobs: run: Compress-Archive -Path result/* -DestinationPath ${{ matrix.package }}.x86_64-windows.zip - name: Create msi - run: | - cp target/x86_64-pc-windows-msvc/release/*.msi ${{ matrix.packages }}.x86-64_windows.msi + run: cp target/x86_64-pc-windows-msvc/release/*.msi ${{ matrix.packages }}.x86-64_windows.msi - uses: actions/upload-artifact@v4 with: diff --git a/deploy/default.nix b/deploy/default.nix index 4a80719bc..d8f4697e5 100644 --- a/deploy/default.nix +++ b/deploy/default.nix @@ -30,7 +30,7 @@ let [ { name = pkgs.lib.concatStrings [ - "native-" + "app-" subdir ]; value = mkAppPackage resource;