fix dhall check

http4s · Apr 14, 2020 · 30e773a · 30e773a
1 parent 2a7cc72
commit 30e773a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/dhall.yml b/.github/workflows/dhall.yml
@@ -6,9 +6,10 @@ jobs:
     - uses: actions/setup-java@v1
       with:
         java-version: '11'
-    - name: Check generated YAML files
-      run: \nbash -c 'sbt convertDhall'\n\n[[ $(git status --porcelain | wc -l) -eq
-        0 ]]\n
+    - name: Generate YAML files
+      run: sbt convertDhall
+    - name: Check for differences
+      run: '[[ $(git status --porcelain | wc -l) -eq 0 ]]'
 name: Check Dhall configs
 'on':
 - push

diff --git a/dhall/dhall.dhall b/dhall/dhall.dhall
@@ -3,16 +3,12 @@ let c = ./common.dhall
 let steps =
       [ c.steps.checkout
       , c.steps.java c.javaVersions.default
+      , c.BuildStep.Run
+          c.Run::{ name = "Generate YAML files", run = "sbt convertDhall" }
       , c.BuildStep.Run
           c.Run::{
-          , name = "Check generated YAML files"
-          , run =
-              ''
-
-              bash -c 'sbt convertDhall'
-
-              [[ $(git status --porcelain | wc -l) -eq 0 ]]
-              ''
+          , name = "Check for differences"
+          , run = "[[ \$(git status --porcelain | wc -l) -eq 0 ]]"
           }
       ]