Skip to content

Commit 2bdd985

Browse files
authored
Merge pull request torvalds#522 from thehajime/fix-win10-ci
lkl: fix openvpn installation issue on windows CI
2 parents 558acc3 + 21db97c commit 2bdd985

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,15 @@ jobs:
7474
run: pip install yamlish junit-xml
7575
- name: Install openvpn
7676
if: runner.os == 'Windows'
77-
shell: msys2 {0}
77+
shell: pwsh
7878
run: |
7979
curl -L -O https://swupdate.openvpn.org/community/releases/OpenVPN-2.5.3-I601-amd64.msi
80-
cmd.exe /c "start /wait msiexec /i OpenVPN-2.5.3-I601-amd64.msi ADDLOCAL=OpenVPN,Drivers.TAPWindows6,Drivers /qn /l*v c:\\msilog.txt"
81-
cat c:\\msilog.txt
80+
$file = "OpenVPN-2.5.3-I601-amd64.msi"
81+
$log = "install.log"
82+
$procMain = Start-Process "msiexec" "/i `"$file`" /qn /l*! `"$log`"" -NoNewWindow -PassThru
83+
$procLog = Start-Process "powershell" "Get-Content -Path `"$log`" -Wait" -NoNewWindow -PassThru
84+
$procMain.WaitForExit()
85+
$procLog.Kill()
8286
- name: Partial Clone
8387
if: runner.os == 'Windows'
8488
shell: msys2 {0}

0 commit comments

Comments
 (0)