From 96416a5e57d4caa0b3602172b9ad44f9ed585f9a Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sat, 11 Dec 2021 17:37:36 +0200 Subject: [PATCH] gh actions #4: try msys2 fix --- .appveyor.yml | 3 ++- .github/workflows/windows-x64.yml | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9477bcc..a0e45f0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,10 +14,11 @@ install: echo \"strawberryperl is not installed. Please fix appveyor.yml\" exit 1 )" + - c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu" - SET PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH% - perl -v - IF NOT EXIST C:\Perl5 mkdir C:\Perl5 - - SET PATH=C:\msys64\bin;C:\Perl5\bin;C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH% + - SET PATH=C:\msys64\mingw64\bin;C:\msys64\bin;C:\Perl5\bin;C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH% - SET PERL5LIB=C:/Perl5/lib/perl5 - SET PERL_LOCAL_LIB_ROOT=C:/Perl5 - SET PERL_MB_OPT=--install_base C:/Perl5 diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml index 46b9856..4c41652 100644 --- a/.github/workflows/windows-x64.yml +++ b/.github/workflows/windows-x64.yml @@ -78,6 +78,9 @@ jobs: IF NOT EXIST C:\strawberry ( echo "strawberryperl is not installed. Please fix appveyor.yml" exit 1 ) || ( echo Failed & exit /B 1 ) + c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu" || ( echo Failed + & exit /B 1 ) + SET PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH% perl -v || ( echo Failed & exit /B 1 ) @@ -85,7 +88,7 @@ jobs: IF NOT EXIST C:\Perl5 mkdir C:\Perl5 || ( echo Failed & exit /B 1 ) - SET PATH=C:\msys64\bin;C:\Perl5\bin;C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH% + SET PATH=C:\msys64\mingw64\bin;C:\msys64\bin;C:\Perl5\bin;C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH% SET PERL5LIB=C:/Perl5/lib/perl5 -- 2.40.0