Add shake dependencies targets

avh4 · Sep 24, 2020 · 06d6d40 · 06d6d40
1 parent 6152590
commit 06d6d40
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/.github/workflows/Build release.yml b/.github/workflows/Build release.yml
@@ -56,7 +56,7 @@ jobs:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
         key: cabal-release-v1-${{ runner.os }}-${{ hashFiles('cabal.project.freeze') }}
     - run: cabal v2-update
-    - run: cabal v2-build --only-dependencies
+    - run: ./build.sh -- dist-dependencies
     - run: ./build.sh -- dist
     - name: Sign artifacts
       run: |

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -42,8 +42,6 @@ jobs:
     #     path: dist-newstyle
     #     key: dist-v1-${{ runner.os }}
     - run: cabal v2-update
-    - run: cabal v2-build --only-dependencies
-    - run: cabal v2-build --only-dependencies  --enable-tests
     - run: ./build.sh -- dependencies
     - run: ./build.sh -- build
     - name: Tests

diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,6 @@ cache:
 
 install:
 - cabal v2-update
-- cabal v2-build --only-dependencies
-- cabal v2-build --only-dependencies --enable-tests
 - ./build.sh -- dependencies
 
 

diff --git a/Shakefile.hs b/Shakefile.hs
@@ -70,7 +70,12 @@ main = do
     phony "dist" $ need [ "dist/elm-format-" ++ gitDescribe ++ "-" ++ show os <.> zipFormat ]
 
     phony "dependencies" $ need
-        [ shellcheck
+        [ "_build/cabal-dependencies.ok"
+        , "_build/cabal-test-dependencies.ok"
+        , shellcheck
+        ]
+    phony "dist-dependencies" $ need
+        [ "_build/cabal-dependencies.ok"
         ]
 
     phony "clean" $ do
@@ -327,6 +332,29 @@ main = do
         writeFile' out ""
 
 
+    --
+    -- dependencies
+    --
+
+    "_build/cabal-dependencies.ok" %> \out -> do
+        need
+            [ "elm-format.cabal"
+            , "cabal.project"
+            , "cabal.project.freeze"
+            ]
+        cmd_ "cabal" [ "v2-build", "--only-dependencies" ]
+        writeFile' out ""
+
+    "_build/cabal-test-dependencies.ok" %> \out -> do
+        need
+            [ "elm-format.cabal"
+            , "cabal.project"
+            , "cabal.project.freeze"
+            ]
+        cmd_ "cabal" [ "v2-build", "--only-dependencies", "--enable-tests" ]
+        writeFile' out ""
+
+
     --
     -- shellcheck
     --