From 01b4917f2665c3178ac4877a6ff16fdaf1cd6033 Mon Sep 17 00:00:00 2001
From: Mike Farah <mikefarah@gmail.com>
Date: Thu, 27 Jan 2022 14:22:01 +1100
Subject: [PATCH] Debug github build

---
 .github/workflows/go.yml  | 1 +
 acceptance_tests/empty.sh | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index ffa2bed..efc6646 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -25,6 +25,7 @@ jobs:
         fi
 
     - name: Check the build
+      shell: bash -l {0}
       run: |
         export PATH=${PATH}:`go env GOPATH`/bin
         scripts/devtools.sh
diff --git a/acceptance_tests/empty.sh b/acceptance_tests/empty.sh
index 671ab89..a0ec742 100755
--- a/acceptance_tests/empty.sh
+++ b/acceptance_tests/empty.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -o
+set -eo pipefail
 
 setUp() {
   rm test*.yml || true
@@ -9,9 +9,6 @@ setUp() {
 EOL
 }
 
-# hack - for some reason in github actions, it
-# golang thinks yq has stdin pipeinto it (ModeNamedPipe is set, ModeCharDevice is not)
-# explicitly add an expression so it doesnt try to read 'test.yml' as one...
 testEmptyEval() {
   X=$(./yq e test.yml)
   expected=$(cat test.yml)
@@ -21,7 +18,7 @@ testEmptyEval() {
 
 testEmptyEvalNoNewLine() {
   echo -n "#comment" >test.yml
-  X=$(./yq e "." test.yml)
+  X=$(./yq e test.yml)
   expected=$(cat test.yml)
   assertEquals 0 $?
   assertEquals "$expected" "$X"