From 0384963609c270873196cc26b71c9490738ecc32 Mon Sep 17 00:00:00 2001
From: Todd Rinaldo <toddr@cpan.org>
Date: Fri, 29 Dec 2023 06:44:44 +0000
Subject: [PATCH] Integrate windows into overall test run.

Set windows path properly so it won't run the wrong compiler.
---
 .github/workflows/testsuite.yml | 28 ++++++++++++++++++++++++++
 .github/workflows/windows.yml   | 35 ---------------------------------
 Makefile.PL                     |  2 +-
 3 files changed, 29 insertions(+), 36 deletions(-)
 delete mode 100644 .github/workflows/windows.yml

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 88ba158..0f42587 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -108,3 +108,31 @@ jobs:
         run: perl Makefile.PL
       - run: make
       - run: make test
+
+# ------------------------------------------------------------------------
+
+  windows:
+    runs-on: windows-latest
+    needs: [ubuntu]
+
+    env:
+      PERL_USE_UNSAFE_INC: 0
+      AUTHOR_TESTING: 0
+      AUTOMATED_TESTING: 1
+      RELEASE_TESTING: 0
+
+    steps:
+      - uses: actions/checkout@master
+      - name: Set PATH for Strawberry Perl
+        uses: egor-tensin/cleanup-path@v3
+        with:
+          dirs: 'C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin'
+          default: 1
+      - name: perl -V
+        run: perl -V
+      - name: Makefile.PL
+        run: perl Makefile.PL EXPATLIBPATH="C:\strawberry\c\lib" EXPATINCPATH="C:\strawberry\c\include"
+      - name: make
+        run: gmake
+      - name: make test
+        run: gmake test
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
deleted file mode 100644
index 7efe07d..0000000
--- a/.github/workflows/windows.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: windows
-
-on:
-  push:
-    branches:
-      - '*'
-    tags-ignore:
-      - '*'
-  pull_request:
-
-jobs:
-  perl:
-    env:
-      PERL_USE_UNSAFE_INC: 0
-      AUTHOR_TESTING: 0
-      AUTOMATED_TESTING: 1
-      RELEASE_TESTING: 0
-
-    runs-on: windows-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        perl-version: [latest]
-
-    steps:
-      - uses: actions/checkout@master
-      - name: perl -V
-        run: perl -V
-      - name: Makefile.PL
-        run: perl Makefile.PL EXPATLIBPATH="C:\strawberry\c\lib" EXPATINCPATH="C:\strawberry\c\include"
-      - name: make
-        run: make
-      - name: make test
-        run: make test
diff --git a/Makefile.PL b/Makefile.PL
index 505d1df..e9aaf42 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,6 +1,6 @@
 use 5.004005;    #Devel::CheckLib
 use ExtUtils::MakeMaker;
-use lib qw(inc);
+use lib './inc';
 use Devel::CheckLib;
 
 use Config;