ci/win: remove 'mingw64' from 'test.sh'

This commit is contained in:
umarcor 2020-11-30 08:13:53 +01:00
parent 0d20bf2123
commit f4aff860e7
2 changed files with 9 additions and 11 deletions

10
.github/test.sh vendored Normal file → Executable file
View File

@ -1,13 +1,15 @@
#!/usr/bin/env sh
git clone https://github.com/steveicarus/ivtest.git
cd ivtest
if [ "$OS" = 'Windows_NT' ]; then
$mingw64 perl update_msys2_report.pl
$mingw64 perl vvp_reg.pl
perl update_msys2_report.pl
perl vvp_reg.pl
diff --strip-trailing-cr regression_report-msys2.txt regression_report.txt
$mingw64 perl vpi_reg.pl
else
perl vvp_reg.pl
diff regression_report-devel.txt regression_report.txt
perl vpi_reg.pl
fi
perl vpi_reg.pl

View File

@ -35,7 +35,7 @@ jobs:
make check
- name: Test
run: sh .github/test.sh
run: ./.github/test.sh
win:
@ -59,15 +59,11 @@ jobs:
- name: Build and test
shell: bash
run: |
export msys2='cmd //C RefreshEnv.cmd '
export msys2+='& set MSYS=winsymlinks:nativestrict '
export msys2+='& C:\\msys64\\msys2_shell.cmd -defterm -no-start'
export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
export msys2+=" -msys2 -c "\"\$@"\" --"
export mingw64='cmd //C RefreshEnv.cmd & set MSYS=winsymlinks:nativestrict & C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "$@" --'
$mingw64 ./autoconf.sh
$mingw64 ./configure
$mingw64 make install
$mingw64 make check
sh .github/test.sh
$mingw64 ./.github/test.sh