Skip to content

Commit

Permalink
Ensures release testing of Windows installer works (#343)
Browse files Browse the repository at this point in the history
This reverts #341 as the root problem was a leftover file.

Signed-off-by: Adrian Cole <[email protected]>
  • Loading branch information
codefromthecrypt authored Aug 13, 2021
1 parent 3af373d commit 0a7450e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ jobs:
# refreshenv is from choco, and lets you reload ENV variables (used here for PATH).
- name: "Test Windows Installer (Windows)"
if: runner.os == 'Windows'
run: call packaging\msi\verify_msi.cmd
run: | # delete func-e.exe which was just tested, so it doesn't taint the tests
del func-e.exe
call packaging\msi\verify_msi.cmd
shell: cmd
env: # use the stashed msi name instead of parsing it
MSI_FILE: ${{ steps.download.outputs.msi }}
Expand Down
4 changes: 0 additions & 4 deletions packaging/msi/verify_msi.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
if not defined MSI_FILE set MSI_FILE=dist\func-e_windows_amd64\func-e.msi
echo installing %MSI_FILE%
msiexec /i %MSI_FILE% /qn || exit /b 1
:: sleep to prevent slow CI hosts from flaking on delayed installer service
sleep 2

:: Use chocolatey tool to refresh the current PATH without exiting the shell
call RefreshEnv.cmd
Expand All @@ -29,8 +27,6 @@ func-e -version || exit /b 1

echo uninstalling func-e
msiexec /x %MSI_FILE% /qn || exit /b 1
:: sleep to prevent slow CI hosts from flaking on delayed installer service
sleep 2

echo ensuring func-e was uninstalled
func-e -version && exit /b 1
Expand Down

0 comments on commit 0a7450e

Please sign in to comment.