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

---
 .github/workflows/linux-nightly.yml   | 10 +++++-----
 .github/workflows/mac-nightly.yml     |  9 +++++----
 .github/workflows/windows-nightly.yml | 21 +++++----------------
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml
index bf43d65c5..ff5ab9571 100644
--- a/.github/workflows/linux-nightly.yml
+++ b/.github/workflows/linux-nightly.yml
@@ -19,8 +19,9 @@
 name: linux nightly/pr CI
 
 on:
-  schedule:
-  - cron: "0 23 * * *"
+  # XXX not supported yet; build on push to "ci" instead
+  # schedule:
+  # - cron: "0 23 * * *"
   pull_request:
     branches: [ master ]
     paths:
@@ -35,9 +36,8 @@ on:
       - '!**.5'
       - '!**.info'
       - '!**.txt'
-  # uncomment when testing CI:
   push:
-    branches: [ master ]
+    branches: [ ci, master ]  # master too for testing
     paths:
       - 'stack*'
       - 'hledger-lib'
@@ -158,7 +158,7 @@ jobs:
 
     - name: Install haskell deps
       run: |
-        stack $ARGS test --bench --only-dependencies
+        stack $ARGS build --test --bench --only-dependencies
         #  --no-terminal
       env:
         ARGS: ${{ matrix.plan.resolver }}
diff --git a/.github/workflows/mac-nightly.yml b/.github/workflows/mac-nightly.yml
index 10b48390a..b2b84643b 100644
--- a/.github/workflows/mac-nightly.yml
+++ b/.github/workflows/mac-nightly.yml
@@ -3,11 +3,12 @@
 name: mac nightly CI
 
 on:
-  schedule:
-  - cron: "0 23 * * *"
+  # XXX not supported yet; build on push to "ci" instead
+  # schedule:
+  # - cron: "0 23 * * *"
   # uncomment when testing CI:
   push:
-    branches: [ master ]
+    branches: [ ci, master ]  # master too for testing
     paths:
       - 'stack*'
       - 'hledger-lib'
@@ -105,7 +106,7 @@ jobs:
 
     - name: Install haskell deps
       run: |
-        stack --resolver=lts --install-ghc test --bench --only-dependencies
+        stack --resolver=lts --install-ghc build --test --bench --only-dependencies
         #  --no-terminal --bench --install-ghc
 
     - name: Build hledger
diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml
index e7cb07aeb..bb34f4ea1 100644
--- a/.github/workflows/windows-nightly.yml
+++ b/.github/workflows/windows-nightly.yml
@@ -4,11 +4,12 @@
 name: windows nightly CI
 
 on:
-  schedule:
-  - cron: "0 23 * * *"
+  # XXX not supported yet; build on push to "ci" instead
+  # schedule:
+  # - cron: "0 23 * * *"
   # uncomment when testing CI:
   push:
-    branches: [ master ]
+    branches: [ ci, master ]  # master too for testing
     paths:
       - 'stack*'
       - 'hledger-lib'
@@ -106,25 +107,13 @@ jobs:
       run: |
         stack --resolver=lts --no-terminal setup
 
-    - name: Show stuff
-      run: |
-        ls C:\Users\runneradmin\
-        ls C:\Users\runneradmin\AppData\
-        ls C:\Users\runneradmin\AppData\Local\
-        ls C:\Users\runneradmin\AppData\Local\Programs\
-        ls C:\Users\runneradmin\AppData\Local\Programs\stack
-        ls C:\Users\runneradmin\AppData\Local\Programs\stack\x86_64-windows
-        ls C:\Users\runneradmin\AppData\LocalLow\
-        ls C:\Users\runneradmin\AppData\Roaming\
-        ls C:\Users\runneradmin\AppData\Roaming\stack\
-
     # - name: Install shelltestrunner
     # - if [[ ! -x ~/.local/bin/shelltest ]]; then stack install shelltestrunner-1.9; fi
     # - shelltest --version
 
     - name: Install haskell deps
       run: |
-        stack --resolver=lts --no-terminal test --only-dependencies
+        stack --resolver=lts --no-terminal build --test --only-dependencies
         #  --bench --install-ghc
 
     - name: Build hledger