From 1fb6fbe807ca5593dac6819f7c1a86333176eae7 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 6 Mar 2020 11:06:15 -0800
Subject: [PATCH] ;ci: github: tweaks

---
 .github/workflows/linux-ci.yml   | 12 ++++++++++--
 .github/workflows/mac-ci.yml     |  4 ++--
 .github/workflows/windows-ci.yml | 32 ++++++++++++++++++++------------
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index c35e2f5a3..2d6910e18 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -30,7 +30,7 @@ on:
       - 'hledger'
       - 'hledger-ui'
       - 'hledger-web'
-      - '.github/workflows/*'
+      - '.github/workflows/linux*'
       - '!**.md'
       - '!**.1'
       - '!**.5'
@@ -44,7 +44,7 @@ on:
       - 'hledger'
       - 'hledger-ui'
       - 'hledger-web'
-      - '.github/workflows/*'
+      - '.github/workflows/linux*'
       - '!**.md'
       - '!**.1'
       - '!**.5'
@@ -150,6 +150,7 @@ jobs:
 
     - name: Install shelltestrunner
       run: |
+        export PATH=~/.local/bin:$PATH
         if [[ ! -x ~/.local/bin/shelltest ]]; then stack $ARGS install shelltestrunner-1.9; fi
         shelltest --version
       env:
@@ -171,6 +172,13 @@ jobs:
 
     - name: Functional tests (excluding addons)
       run: |
+        export PATH=~/.local/bin:$PATH
         COLUMNS=80 stack $ARGS exec -- shelltest --execdir -j16 tests -x /bin -x /addons
       env:
         ARGS: ${{ matrix.plan.resolver }}
+
+# - name: Configure
+#   if: startsWith(matrix.name, 'linux')
+#   run: |
+#     export PATH=/usr/local/bin:$PATH
+#     cmake -B build -S . -DCMAKE_BUILD_TYPE=Debug ...
diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml
index ce627e515..ae13280c0 100644
--- a/.github/workflows/mac-ci.yml
+++ b/.github/workflows/mac-ci.yml
@@ -15,7 +15,7 @@ on:
       - 'hledger'
       - 'hledger-ui'
       - 'hledger-web'
-      - '.github/workflows/*'
+      - '.github/workflows/mac*'
       - '!**.md'
       - '!**.1'
       - '!**.5'
@@ -29,7 +29,7 @@ on:
   #     - 'hledger'
   #     - 'hledger-ui'
   #     - 'hledger-web'
-  #     - '.github/workflows/*'
+  #     - '.github/workflows/mac*'
   #     - '!**.md'
   #     - '!**.1'
   #     - '!**.5'
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
index bdd7b2632..456fa9510 100644
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -15,7 +15,7 @@ on:
       - 'hledger'
       - 'hledger-ui'
       - 'hledger-web'
-      - '.github/workflows/*'
+      - '.github/workflows/windows*'
       - '!**.md'
       - '!**.1'
       - '!**.5'
@@ -29,7 +29,7 @@ on:
   #     - 'hledger'
   #     - 'hledger-ui'
   #     - 'hledger-web'
-  #     - '.github/workflows/*'
+  #     - '.github/workflows/windows*'
   #     - '!**.md'
   #     - '!**.1'
   #     - '!**.5'
@@ -49,11 +49,11 @@ jobs:
         path: ~/.stack
         key: ${{ runner.os }}-stack
 
-    - name: Cache %APPDATA%/.stack
-      uses: actions/cache@v1
-      with:
-        path: %APPDATA%/.stack
-        key: ${{ runner.os }}-stack
+    # - name: Cache %APPDATA%/.stack
+    #   uses: actions/cache@v1
+    #   with:
+    #     path: %APPDATA%/.stack
+    #     key: ${{ runner.os }}-stack
 
     - name: Cache $APPDATA/.stack
       uses: actions/cache@v1
@@ -61,11 +61,11 @@ jobs:
         path: $APPDATA/.stack
         key: ${{ runner.os }}-stack
 
-    - name: Cache %APPDATA%/local/bin
-      uses: actions/cache@v1
-      with:
-        path: %APPDATA%/local/bin
-        key: ${{ runner.os }}-local-bin
+    # - name: Cache %APPDATA%/local/bin
+    #   uses: actions/cache@v1
+    #   with:
+    #     path: %APPDATA%/local/bin
+    #     key: ${{ runner.os }}-local-bin
 
     - name: Cache $APPDATA/local/bin
       uses: actions/cache@v1
@@ -145,3 +145,11 @@ jobs:
     #   with:
     #     name: hledger.zip
     #     path: hledger.zip
+
+
+# - name: Configure
+#   if: startsWith(matrix.name, 'windows')
+#   run: |
+#     set PATH=C:\ProgramData\scoop\shims;%PATH%
+#     call "${{ matrix.vcvarsall }}" x64 # Sets a whole bunch of environment variables used by the next call to cmake.
+#     cmake -B build -S . -DCMAKE_BUILD_TYPE=Debug ... # Same as above (duplicated)