Skip to content

Commit 06d6d40

Browse files
committed
Add shake dependencies targets
1 parent 6152590 commit 06d6d40

File tree

4 files changed

+30
-6
lines changed

4 files changed

+30
-6
lines changed

.github/workflows/Build release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
path: ${{ steps.setup-haskell.outputs.cabal-store }}
5757
key: cabal-release-v1-${{ runner.os }}-${{ hashFiles('cabal.project.freeze') }}
5858
- run: cabal v2-update
59-
- run: cabal v2-build --only-dependencies
59+
- run: ./build.sh -- dist-dependencies
6060
- run: ./build.sh -- dist
6161
- name: Sign artifacts
6262
run: |

.github/workflows/CI.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ jobs:
4242
# path: dist-newstyle
4343
# key: dist-v1-${{ runner.os }}
4444
- run: cabal v2-update
45-
- run: cabal v2-build --only-dependencies
46-
- run: cabal v2-build --only-dependencies --enable-tests
4745
- run: ./build.sh -- dependencies
4846
- run: ./build.sh -- build
4947
- name: Tests

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ cache:
1313

1414
install:
1515
- cabal v2-update
16-
- cabal v2-build --only-dependencies
17-
- cabal v2-build --only-dependencies --enable-tests
1816
- ./build.sh -- dependencies
1917

2018

Shakefile.hs

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,12 @@ main = do
7070
phony "dist" $ need [ "dist/elm-format-" ++ gitDescribe ++ "-" ++ show os <.> zipFormat ]
7171

7272
phony "dependencies" $ need
73-
[ shellcheck
73+
[ "_build/cabal-dependencies.ok"
74+
, "_build/cabal-test-dependencies.ok"
75+
, shellcheck
76+
]
77+
phony "dist-dependencies" $ need
78+
[ "_build/cabal-dependencies.ok"
7479
]
7580

7681
phony "clean" $ do
@@ -327,6 +332,29 @@ main = do
327332
writeFile' out ""
328333

329334

335+
--
336+
-- dependencies
337+
--
338+
339+
"_build/cabal-dependencies.ok" %> \out -> do
340+
need
341+
[ "elm-format.cabal"
342+
, "cabal.project"
343+
, "cabal.project.freeze"
344+
]
345+
cmd_ "cabal" [ "v2-build", "--only-dependencies" ]
346+
writeFile' out ""
347+
348+
"_build/cabal-test-dependencies.ok" %> \out -> do
349+
need
350+
[ "elm-format.cabal"
351+
, "cabal.project"
352+
, "cabal.project.freeze"
353+
]
354+
cmd_ "cabal" [ "v2-build", "--only-dependencies", "--enable-tests" ]
355+
writeFile' out ""
356+
357+
330358
--
331359
-- shellcheck
332360
--

0 commit comments

Comments
 (0)