From 917cbdb2fae2eb39a361b27b14b7e026c176964f Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 18 Oct 2020 22:23:37 -0700
Subject: [PATCH] ;ci tweak

---
 .github/workflows/linux.yml |  4 +---
 .github/workflows/mac.yml   |  2 +-
 .github/workflows/push.yml  | 12 +++++-------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index fcbc1c4f0..b55ff07d6 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -161,9 +161,7 @@ jobs:
         export PATH=~/.local/bin:$PATH
         # curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack
         if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
-        $stack --version
-      env:
-        stack: ${{ matrix.plan.stack }}
+        stack --version
 
     - name: Install GHC
       env:
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index b64020b8f..aab982a42 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -116,7 +116,7 @@ jobs:
         export PATH=~/.local/bin:$PATH
         curl -sL https://get.haskellstack.org/stable/osx-x86_64 | gtar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack
         # if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/osx-x86_64 | gtar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
-        $stack --version
+        stack --version
 
     - name: Install GHC
       env:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index edc598869..5b42e85d8 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -119,14 +119,12 @@ jobs:
     # actions:
 
     - name: Install stack
-      # curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C $INSTALLDIR '*/stack'
-      # mkdir -p ~/.local/bin
-      # export PATH=~/.local/bin:$PATH
-      # if [[ ! -x ~/.local/bin/stack ]]; then curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
       run: |
-        $stack --version
-      env:
-        stack: ${{ matrix.plan.stack }}
+        mkdir -p ~/.local/bin
+        export PATH=~/.local/bin:$PATH
+        # curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack
+        if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
+        stack --version
 
     - name: Install GHC
       env: