From 928d50e1564ae74b7cf0f420f6f581aeea86dd57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= <ondrej@certik.us>
Date: Tue, 21 Jul 2020 09:09:42 -0600
Subject: Update CI

---
 .github/workflows/CI.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.github/workflows/CI.yml')

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index ca1ba03..fd2d9b1 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -63,8 +63,10 @@ jobs:
 
     - name: Build
       run: |
+        cd bootstrap
         stack build
 
     - name: Run tests
       run: |
+        cd bootstrap
         stack test
-- 
cgit v1.2.3


From 3f9dcf1b12b4221392e2a212e3220340ca15e6ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= <ondrej@certik.us>
Date: Tue, 21 Jul 2020 11:53:41 -0600
Subject: CI: build and run the Fortran based fpm

---
 .github/workflows/CI.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to '.github/workflows/CI.yml')

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index fd2d9b1..32ead94 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -61,12 +61,19 @@ jobs:
         --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
         --slave /usr/bingcov gcov /usr/bin/gcov-${GCC_V}
 
-    - name: Build
+    - name: Build Haskell fpm
       run: |
         cd bootstrap
         stack build
+        stack install
 
-    - name: Run tests
+    - name: Run tests on Haskell fpm
       run: |
         cd bootstrap
         stack test
+
+    - name: Build and run Fortran fpm
+      run: |
+        cd fpm
+        fpm build
+        fpm run
-- 
cgit v1.2.3


From f3fb461f1e89ad351bf8d28eb16ff7f98fc23895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= <ondrej@certik.us>
Date: Tue, 21 Jul 2020 12:03:05 -0600
Subject: CI: put fpm to $PATH on macOS

---
 .github/workflows/CI.yml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.github/workflows/CI.yml')

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 32ead94..ec1afda 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -67,6 +67,11 @@ jobs:
         stack build
         stack install
 
+    - name: macOS: put fpm to PATH
+      if: contains(matrix.os, 'macos')
+      run: |
+          cp /Users/runner/.local/bin/fpm /usr/local/bin
+
     - name: Run tests on Haskell fpm
       run: |
         cd bootstrap
-- 
cgit v1.2.3


From 55d59057173235daac3eee96de78b0b35412d0e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= <ondrej@certik.us>
Date: Tue, 21 Jul 2020 12:24:15 -0600
Subject: Put fpm to PATH on Windows

---
 .github/workflows/CI.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to '.github/workflows/CI.yml')

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index ec1afda..f4e2878 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -67,11 +67,16 @@ jobs:
         stack build
         stack install
 
-    - name: macOS: put fpm to PATH
+    - name: put fpm to PATH (macOS)
       if: contains(matrix.os, 'macos')
       run: |
           cp /Users/runner/.local/bin/fpm /usr/local/bin
 
+    - name: put fpm to PATH (Windows)
+      if: contains(matrix.os, 'windows')
+      run: |
+          copy "C:\Users\runneradmin\AppData\Roaming\local\bin\fpm.exe" "C:\Program Files\Git\usr\bin"
+
     - name: Run tests on Haskell fpm
       run: |
         cd bootstrap
-- 
cgit v1.2.3