Skip to content
This repository was archived by the owner on Jan 2, 2021. It is now read-only.

Commit 7d9d2a5

Browse files
authored
Skip unnecessary packing of cache artifacts (#794)
* Skip unnecessary packing (takes 2m) when we had a successful cache hit * Pack before testing * Reenable benchmark CI * Disable Windows CI Caching is broken and stackage builds fail all the time with timeouts to casa.fpcomplete.com
1 parent 436232d commit 7d9d2a5

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

Diff for: .azure/linux-bench.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131
- bash: stack setup --stack-yaml=$STACK_YAML
3232
displayName: 'stack setup'
3333
- bash: stack build --bench --only-dependencies --stack-yaml=$STACK_YAML
34-
displayName: 'stack build --only-dependencies'
35-
- bash: |
36-
export PATH=/opt/cabal/bin:$PATH
37-
stack bench --ghc-options=-Werror --stack-yaml=$STACK_YAML
38-
displayName: 'stack bench --ghc-options=-Werror'
34+
displayName: 'stack build --bench --only-dependencies'
3935
- bash: |
4036
mkdir -p .azure-cache
4137
tar czf .azure-cache/stack-root.tar.gz -C $HOME .stack
4238
displayName: "Pack cache"
39+
- bash: |
40+
export PATH=/opt/cabal/bin:$PATH
41+
stack bench --ghc-options=-Werror --stack-yaml=$STACK_YAML
42+
displayName: 'stack bench --ghc-options=-Werror'
4343
- bash: |
4444
cat bench-hist/results.csv
4545
displayName: "cat results"

Diff for: .azure/linux-stack.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ jobs:
4343
displayName: 'stack setup'
4444
- bash: stack build --only-dependencies --stack-yaml=$STACK_YAML
4545
displayName: 'stack build --only-dependencies'
46+
- bash: |
47+
mkdir -p .azure-cache
48+
tar czf .azure-cache/stack-root.tar.gz -C $HOME .stack
49+
displayName: "Pack cache"
50+
condition: eq(variables.CACHE_RESTORED, 'false')
4651
- bash: |
4752
export PATH=/opt/cabal/bin:$PATH
4853
stack test --ghc-options=-Werror --stack-yaml=$STACK_YAML || stack test --ghc-options=-Werror --stack-yaml=$STACK_YAML --ta "--rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true stack test --ghc-options=-Werror --stack-yaml=$STACK_YAML --ta "--rerun"
4954
# ghcide stack tests are flaky, see https://github.com/digital-asset/daml/issues/2606.
5055
displayName: 'stack test --ghc-options=-Werror'
51-
- bash: |
52-
mkdir -p .azure-cache
53-
tar czf .azure-cache/stack-root.tar.gz -C $HOME .stack
54-
displayName: "Pack cache"

Diff for: .azure/windows-stack.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ jobs:
5555
stack build --only-dependencies --stack-yaml $STACK_YAML
5656
fi
5757
displayName: 'stack build --only-dependencies'
58+
- bash: |
59+
mkdir -p .azure-cache
60+
tar -vczf .azure-cache/stack-root.tar.gz $(cygpath $STACK_ROOT)
61+
tar -vczf .azure-cache/stack-work.tar.gz .stack-work
62+
displayName: "Pack cache"
5863
- bash: |
5964
if [ "$STACK_YAML" = "stack8101.yaml" ]; then
6065
stack test --no-run-tests --ghc-options="-Werror -fexternal-interpreter" --stack-yaml $STACK_YAML || stack test --no-run-tests --ghc-options="-Werror -fexternal-interpreter" --stack-yaml $STACK_YAML || stack test --no-run-tests --ghc-options="-Werror -fexternal-interpreter" --stack-yaml $STACK_YAML
@@ -63,8 +68,3 @@ jobs:
6368
fi
6469
displayName: 'stack test --ghc-options=-Werror'
6570
# TODO: run test suite when failing tests are fixed or marked as broken. See https://github.com/digital-asset/ghcide/issues/474
66-
- bash: |
67-
mkdir -p .azure-cache
68-
tar -vczf .azure-cache/stack-root.tar.gz $(cygpath $STACK_ROOT)
69-
tar -vczf .azure-cache/stack-work.tar.gz .stack-work
70-
displayName: "Pack cache"

Diff for: azure-pipelines.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@ pr:
1515

1616
jobs:
1717
- template: ./.azure/linux-stack.yml
18-
- template: ./.azure/windows-stack.yml
19-
# https://github.com/haskell/ghcide/pull/801
20-
# - template: ./.azure/linux-bench.yml
18+
# - template: ./.azure/windows-stack.yml
19+
- template: ./.azure/linux-bench.yml

0 commit comments

Comments
 (0)