3 files changed, 37 insertions, 8 deletions
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 574c565..784a0d6 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -82,12 +82,12 @@ jobs:
         cd bootstrap
         stack test
 
-    - name: Build and run Fortran fpm
+    - name: Build and run Fortran fpm (Linux / macOS)
+      if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
       run: |
-        cd fpm
-        fpm build
-        fpm run
-        fpm run --args build
-        cd ../test/example_packages/hello_world
-        ../../../fpm/fpm build
-        ./hello_world
+        ci/run_tests.sh
+
+    - name: Build and run Fortran fpm (Windows)
+      if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
+      run: |
+        call ci/run_tests.bat
diff --git a/ci/run_tests.bat b/ci/run_tests.bat
new file mode 100755
index 0000000..258eae8
--- /dev/null
+++ b/ci/run_tests.bat
@@ -0,0 +1,19 @@
+@echo on
+
+cd fpm
+if errorlevel 1 exit 1
+
+fpm build
+if errorlevel 1 exit 1
+
+fpm run
+if errorlevel 1 exit 1
+
+fpm run --args build
+if errorlevel 1 exit 1
+
+cd ..\test\example_packages\hello_world
+if errorlevel 1 exit 1
+
+..\..\..\fpm\fpm build
+if errorlevel 1 exit 1
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
new file mode 100755
index 0000000..9767c9a
--- /dev/null
+++ b/ci/run_tests.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+cd fpm
+fpm build
+fpm run
+fpm run --args build
+cd ../test/example_packages/hello_world
+../../../fpm/fpm build