Pack before testing

haskell · Sep 13, 2020 · baf40d4 · baf40d4
1 parent fdbcc9d
commit baf40d4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
@@ -43,13 +43,13 @@ jobs:
     displayName: 'stack setup'
   - bash: stack build --only-dependencies --stack-yaml=$STACK_YAML
     displayName: 'stack build --only-dependencies'
-  - bash: |
-      export PATH=/opt/cabal/bin:$PATH
-      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"
-    # ghcide stack tests are flaky, see https://github.com/digital-asset/daml/issues/2606.
-    displayName: 'stack test --ghc-options=-Werror'
   - bash: |
       mkdir -p .azure-cache
       tar czf .azure-cache/stack-root.tar.gz -C $HOME .stack
     displayName: "Pack cache"
     condition: eq(variables.CACHE_RESTORED, 'false')
+  - bash: |
+      export PATH=/opt/cabal/bin:$PATH
+      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"
+    # ghcide stack tests are flaky, see https://github.com/digital-asset/daml/issues/2606.
+    displayName: 'stack test --ghc-options=-Werror'
diff --git a/.azure/windows-stack.yml b/.azure/windows-stack.yml
@@ -57,6 +57,11 @@ jobs:
         stack build --only-dependencies --stack-yaml $STACK_YAML
       fi
     displayName: 'stack build --only-dependencies'
+  - bash: |
+      mkdir -p .azure-cache
+      tar -vczf .azure-cache/stack-root.tar.gz $(cygpath $STACK_ROOT)
+      tar -vczf .azure-cache/stack-work.tar.gz .stack-work
+    displayName: "Pack cache"
   - bash: |
       if [ "$STACK_YAML" = "stack8101.yaml" ]; then
         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
@@ -65,8 +70,3 @@ jobs:
       fi
     displayName: 'stack test --ghc-options=-Werror'
     # TODO: run test suite when failing tests are fixed or marked as broken. See https://github.com/digital-asset/ghcide/issues/474
-  - bash: |
-      mkdir -p .azure-cache
-      tar -vczf .azure-cache/stack-root.tar.gz $(cygpath $STACK_ROOT)
-      tar -vczf .azure-cache/stack-work.tar.gz .stack-work
-    displayName: "Pack cache"