[commit: ghc] master: Run tests after artifact collection (605ae8d)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/605ae8dd28ef71f13d0e5346b8798a6c41c459d0/ghc

>---------------------------------------------------------------

commit 605ae8dd28ef71f13d0e5346b8798a6c41c459d0
Author: mrkkrp <markkarpov92 at gmail.com>
Date:   Wed Apr 4 20:38:54 2018 +0700

    Run tests after artifact collection
    
    Since for every job there are failing tests, if we try to upload artifacts
    after tests, we won't get any. As a temporary measure I suggest uploading
    artifacts before running tests. Once tests are fixed, we should peform
    artifact uploading after tests again.


>---------------------------------------------------------------

605ae8dd28ef71f13d0e5346b8798a6c41c459d0
 .appveyor.sh         |  2 +-
 .circleci/config.yml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.appveyor.sh b/.appveyor.sh
index 22cc520..1a3e597 100644
--- a/.appveyor.sh
+++ b/.appveyor.sh
@@ -31,10 +31,10 @@ EOF
         ;;
 
     "test")
-        make test THREADS=$THREADS
         make binary-dist
         curl https://ghc-artifacts.s3.amazonaws.com/tools/ghc-artifact-collector-x86_64-windows --output ghc-artifact-collector
         ./ghc-artifact-collector *.tar.xz
+        make test THREADS=$THREADS
         ;;
 
     *)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2d0e645..bb071bb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,9 +96,9 @@ jobs:
       - *boot
       - *configure_unix
       - *make
-      - *test
       - *bindist
       - *storeartifacts
+      - *test
 
   "validate-x86_64-freebsd":
     resource_class: xlarge
@@ -115,9 +115,9 @@ jobs:
       - *boot
       - *configure_bsd
       - *make
-      - *test
       - *bindist
       - *storeartifacts
+      - *test
 
   "validate-x86_64-darwin":
     macos:
@@ -136,9 +136,9 @@ jobs:
       - *boot
       - *configure_unix
       - *make
-      - *test
       - *bindist
       - *storeartifacts
+      - *test
 
   "validate-hadrian-x86_64-linux":
     resource_class: xlarge
@@ -224,9 +224,9 @@ jobs:
       - *boot
       - *configure_unix_32
       - *make
-      - *test
       - *bindist
       - *storeartifacts
+      - *test
 
   "validate-x86_64-fedora":
     resource_class: xlarge
@@ -242,9 +242,9 @@ jobs:
       - *boot
       - *configure_unix
       - *make
-      - *test
       - *bindist
       - *storeartifacts
+      - *test
 
 workflows:
   version: 2