Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
id: cache-msi
with:
path: fluent-package/msi/repositories
key: ${{ runner.os }}-cache-windows-${{ hashFiles('**/config.rb', '**/Rakefile', '**/Gemfile*', '!**/*.ps1', 'fluent-package/msi/source.wxs', 'fluent-package/msi/parameters.wxi.erb', 'fluent-package/msi/localization-en-us.wxl', 'fluent-package/msi/exclude-files.xslt', 'fluent-package/msi/Dockerfile') }}
key: ${{ runner.os }}-cache-windows-${{ hashFiles('**/config.rb', '**/Rakefile', '**/Gemfile*', 'fluent-package/msi/assets/*', 'fluent-package/msi/source.wxs', 'fluent-package/msi/parameters.wxi.erb', 'fluent-package/msi/localization-en-us.wxl', 'fluent-package/msi/exclude-files.xslt', 'fluent-package/msi/Dockerfile') }}
- name: Build
if: ${{ ! steps.cache-msi.outputs.cache-hit }}
run: |
Expand Down Expand Up @@ -61,6 +61,7 @@ jobs:
matrix:
test:
- "install-test.ps1"
- "install-test-with-install-path-including-space.ps1"
- "update-from-v4-test.ps1"
- "update-from-v4-test.ps1 -ViaV5"
- "update-from-v5-test.ps1"
Expand Down
2 changes: 1 addition & 1 deletion fluent-package/msi/assets/fluent-package-post-toast.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
title Fluent-package post toast script
if exist "C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe" (
if exist "%~dp0..\bin\fluent-package-post-toast.ps1" (
"C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe" "%~dp0..\bin\fluent-package-post-toast.ps1"
"C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe" -File "%~dp0..\bin\fluent-package-post-toast.ps1"
)
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
$ErrorActionPreference = 'Stop'

$msi = ((Get-Item "C:\\fluentd\\fluent-package\\msi\\repositories\\fluent-package-*.msi") | Sort-Object -Descending { $_.LastWriteTime } | Select-Object -First 1).FullName
Write-Host "Installing ${msi} ..."

# Remove property logs (/lp) since they are large.
$logOptions = "/liwearucmo"

$process = Start-Process msiexec -ArgumentList "/i", $msi, "/quiet", $logOptions, "installer.log", "OPTLOCATION=""C:\opt with space""" -Wait -NoNewWindow -PassThru

if ($process.ExitCode -ne 0) {
Get-Content installer.log
Write-Host ".msi failed with exit code: $($process.ExitCode)."
[Environment]::Exit(1)
}

Loading