From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sat, 11 Dec 2021 16:39:58 +0000 (+0200)
Subject: gh actions #8: win64: try PERL5LIB fix for docmake
X-Git-Tag: fortune-mod-3.8.0~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e079bd98642bcd1ae831fd0395ac231affd30c1;p=fortune-mod

gh actions #8: win64: try PERL5LIB fix for docmake
---

diff --git a/.appveyor.yml b/.appveyor.yml
index 8db69be..0336994 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -19,18 +19,18 @@ install:
     - perl -v
     - IF NOT EXIST C:\Perl5 mkdir C:\Perl5
     - 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 PERL5LIB=%PERL5LIB%;C:/Perl5/lib/perl5
     - SET PERL_LOCAL_LIB_ROOT=C:/Perl5
     - SET PERL_MB_OPT=--install_base C:/Perl5
     - SET PERL_MM_OPT=INSTALL_BASE=C:/Perl5
-    - cpanm --notest App::Docmake Code::TidyAll::Plugin::ClangFormat Code::TidyAll::Plugin::Flake8 Code::TidyAll::Plugin::TestCount Env::Path File::Find::Object IO::All List::Util Path::Tiny Perl::Critic Perl::Tidy Pod::Coverage::TrustPod String::ShellQuote Test::Code::TidyAll Test::Differences Test::EOL Test::Pod Test::Pod::Coverage Test::RunValgrind Test::TrailingSpace Test::Trap
+    - cpanm --notest App::Docmake Code::TidyAll::Plugin::ClangFormat Code::TidyAll::Plugin::Flake8 Code::TidyAll::Plugin::TestCount Env::Path File::Find::Object List::Util Path::Tiny Perl::Critic Perl::Tidy String::ShellQuote Test::Code::TidyAll Test::Differences Test::RunValgrind Test::TrailingSpace Test::Trap
     - if not exist C:\libtap mkdir C:\libtap
     - copy C:\msys64\mingw64\bin\mingw32-make.exe C:\msys64\mingw64\bin\make.exe
     # - SET PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%
-    - SET PERL5LIB=C:/_P5/lib/perl5
-    - SET PERL_LOCAL_LIB_ROOT=C:/_P5
-    - SET PERL_MB_OPT=--install_base C:/_P5
-    - SET PERL_MM_OPT=INSTALL_BASE=C:/_P5
+    # - SET PERL5LIB=%PERL5LIB%;C:/_P5/lib/perl5
+    # - SET PERL_LOCAL_LIB_ROOT=C:/_P5
+    # - SET PERL_MB_OPT=--install_base C:/_P5
+    # - SET PERL_MM_OPT=INSTALL_BASE=C:/_P5
     - perl -v
     # - if not exist C:\libtap\gperf-3.0.4.tar.gz curl -o C:\libtap\gperf-3.0.4.tar.gz http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz
     - curl -o C:\libtap\gperf-3.0.4.tar.gz http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz
diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml
index 48072f9..b475451 100644
--- a/.github/workflows/windows-x64.yml
+++ b/.github/workflows/windows-x64.yml
@@ -38,8 +38,6 @@ jobs:
 
                     File::Find::Object
 
-                    IO::All
-
                     List::Util
 
                     Path::Tiny
@@ -48,20 +46,12 @@ jobs:
 
                     Perl::Tidy
 
-                    Pod::Coverage::TrustPod
-
                     String::ShellQuote
 
                     Test::Code::TidyAll
 
                     Test::Differences
 
-                    Test::EOL
-
-                    Test::Pod
-
-                    Test::Pod::Coverage
-
                     Test::RunValgrind
 
                     Test::TrailingSpace
@@ -89,7 +79,7 @@ jobs:
 
                 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 PERL5LIB=%PERL5LIB%;C:/Perl5/lib/perl5
 
                 SET PERL_LOCAL_LIB_ROOT=C:/Perl5
 
@@ -103,14 +93,6 @@ jobs:
                 copy C:\msys64\mingw64\bin\mingw32-make.exe C:\msys64\mingw64\bin\make.exe
                 || ( echo Failed & exit /B 1 )
 
-                SET PERL5LIB=C:/_P5/lib/perl5
-
-                SET PERL_LOCAL_LIB_ROOT=C:/_P5
-
-                SET PERL_MB_OPT=--install_base C:/_P5
-
-                SET PERL_MM_OPT=INSTALL_BASE=C:/_P5
-
                 perl -v || ( echo Failed & exit /B 1 )
 
                 curl -o C:\libtap\gperf-3.0.4.tar.gz http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz