summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrkkrp <markkarpov92@gmail.com>2018-04-04 20:38:54 +0700
committerBen Gamari <ben@smart-cactus.org>2018-04-07 13:30:15 -0400
commit605ae8dd28ef71f13d0e5346b8798a6c41c459d0 (patch)
treeaf13b78e355dac9738b3f64ed2b8d7a17580b613
parent7bd7fecbc9819adfb097aab5fa7e0fe1cdf1cefd (diff)
downloadhaskell-605ae8dd28ef71f13d0e5346b8798a6c41c459d0.tar.gz
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.
-rw-r--r--.appveyor.sh2
-rw-r--r--.circleci/config.yml10
2 files changed, 6 insertions, 6 deletions
diff --git a/.appveyor.sh b/.appveyor.sh
index 22cc520203..1a3e597da4 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 2d0e64560b..bb071bbd5d 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