From 43b7c1774c62e06e5a16561dc779d27ef9ad6a6f Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Mon, 26 Jun 2023 01:01:50 +0400 Subject: [PATCH] Update wix on the release CI Fixes #6939. --- .github/workflows/release.yml | 10 +-- alacritty/windows/wix/alacritty.wxs | 113 ++++++++++++---------------- alacritty_terminal/src/selection.rs | 2 + 3 files changed, 56 insertions(+), 69 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98903798..ccf10322 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,14 +48,12 @@ jobs: ./.github/workflows/upload_asset.sh \ ./Alacritty-${GITHUB_REF##*/}-portable.exe $GITHUB_TOKEN - name: Install WiX - run: nuget install WiX + run: dotnet tool install --global wix --version 4.0.1 - name: Crate msi installer run: | - ./WiX.*/tools/candle.exe -nologo -arch "x64" -ext WixUIExtension -ext WixUtilExtension \ - -out "./alacritty.wixobj" "alacritty/windows/wix/alacritty.wxs" - ./WiX.*/tools/light.exe -nologo -ext WixUIExtension -ext WixUtilExtension \ - -out "./Alacritty-${GITHUB_REF##*/}-installer.msi" -sice:ICE61 -sice:ICE91 \ - "./alacritty.wixobj" + wix extension add WixToolset.UI.wixext WixToolset.Util.wixext + wix build -arch "x64" -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext \ + -out "./Alacritty-${GITHUB_REF##*/}-installer.msi" "alacritty/windows/wix/alacritty.wxs" - name: Upload msi installer run: | ./.github/workflows/upload_asset.sh \ diff --git a/alacritty/windows/wix/alacritty.wxs b/alacritty/windows/wix/alacritty.wxs index 7470b121..be81b8cb 100644 --- a/alacritty/windows/wix/alacritty.wxs +++ b/alacritty/windows/wix/alacritty.wxs @@ -1,64 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/alacritty_terminal/src/selection.rs b/alacritty_terminal/src/selection.rs index 542430d3..1536724c 100644 --- a/alacritty_terminal/src/selection.rs +++ b/alacritty_terminal/src/selection.rs @@ -469,6 +469,7 @@ mod tests { assert_eq!(selection.to_range(&term(1, 2)), None); } + #[rustfmt::skip] /// Test selection across adjacent lines. /// /// 1. [ ][ ][ ][ ][ ] @@ -490,6 +491,7 @@ mod tests { }); } + #[rustfmt::skip] /// Test selection across adjacent lines. /// /// 1. [ ][ ][ ][ ][ ]