From 576dc56d8348a2dc57ebbe6b91abff78aaf88434 Mon Sep 17 00:00:00 2001 From: ksaric Date: Mon, 30 Jul 2018 16:01:36 +0200 Subject: [PATCH 1/6] Test that CI runs test. --- ChangeLog.md | 1 + test/Spec.hs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 72f3347..ee0b540 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,4 @@ # Changelog for log-classifier ## Unreleased changes + diff --git a/test/Spec.hs b/test/Spec.hs index a97423d..928d7b7 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -605,7 +605,7 @@ exportZendeskDataToLocalDBSpec = ticketsToExport <- run appExecution -- Check that we have tickets. - assert . not . null $ ticketsToExport + assert . null $ ticketsToExport assert $ length ticketsToExport == length listTickets where -- [a] -> Int -> Int -> (a -> m b) -> m [b] From 80ecbe61caa939d348e2a595a9d2af71ca8a4e9f Mon Sep 17 00:00:00 2001 From: Rob Cohen Date: Mon, 30 Jul 2018 11:47:53 -0400 Subject: [PATCH 2/6] Changed pipeline --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index c3d7e6b..d8d21d3 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,5 +1,5 @@ steps: - label: 'log-classifier-x86_64-linux-nix' - command: 'nix build -f default.nix' + command: 'nix-shell --command "runhaskell Setup.hs configure --enable-tests; runhaskell Setup.hs build; runhaskell Setup.hs test"' agents: system: x86_64-linux From 4dad5db3a0d2b7d48c1cd665e0cc41779d5b55c2 Mon Sep 17 00:00:00 2001 From: Rob Cohen Date: Mon, 30 Jul 2018 11:51:40 -0400 Subject: [PATCH 3/6] [TSD-92] - Minor doc changes --- CI-NIX.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CI-NIX.md b/CI-NIX.md index 51a3b1c..e993693 100644 --- a/CI-NIX.md +++ b/CI-NIX.md @@ -20,20 +20,26 @@ The pipeline that is executed is located in the .buildkite folder. ## Developing / Building via Nix -These are the instructions for using nix to build log-classifier. - All the commands below are executed in the cloned log-classifier directory. +Build with verbose output: +``` +$ nix-shell --command "runhaskell Setup.hs configure --enable-tests; runhaskell Setup.hs build; runhaskell Setup.hs test" +``` + +Build without verbose output: ``` $ nix build -f default.nix ``` + You can also build within nix-shell: ``` $ nix-shell nix-shell $ runhaskell Setup.hs configure nix-shell $ runhaskell Setup.hs build +nix-shell $ runhaskell Setup.hs test ``` If you would prefer to use the repl: From a0ef9f01a802ef72341b23a2c2c7d3fc70eb0299 Mon Sep 17 00:00:00 2001 From: Rob Cohen Date: Mon, 30 Jul 2018 12:28:20 -0400 Subject: [PATCH 4/6] [TSD-92] - nix-build in buildkite --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index d8d21d3..8d39344 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,5 +1,5 @@ steps: - label: 'log-classifier-x86_64-linux-nix' - command: 'nix-shell --command "runhaskell Setup.hs configure --enable-tests; runhaskell Setup.hs build; runhaskell Setup.hs test"' + command: 'nix-build' agents: system: x86_64-linux From 582578a11ab88059438c2a279ec628786846ad72 Mon Sep 17 00:00:00 2001 From: Rob Cohen Date: Mon, 30 Jul 2018 12:31:03 -0400 Subject: [PATCH 5/6] [TSD-92] - doc mods --- CI-NIX.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/CI-NIX.md b/CI-NIX.md index e993693..e04578f 100644 --- a/CI-NIX.md +++ b/CI-NIX.md @@ -22,17 +22,12 @@ The pipeline that is executed is located in the .buildkite folder. All the commands below are executed in the cloned log-classifier directory. -Build with verbose output: -``` -$ nix-shell --command "runhaskell Setup.hs configure --enable-tests; runhaskell Setup.hs build; runhaskell Setup.hs test" -``` -Build without verbose output: +Build with test output: ``` -$ nix build -f default.nix +$ nix-build ``` - You can also build within nix-shell: ``` From 7cad9ba53fd016d186506f62a1d14fcd7d02a608 Mon Sep 17 00:00:00 2001 From: Rob Cohen Date: Tue, 31 Jul 2018 09:04:37 -0400 Subject: [PATCH 6/6] fixed Spec.hs --- test/Spec.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Spec.hs b/test/Spec.hs index 928d7b7..a97423d 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -605,7 +605,7 @@ exportZendeskDataToLocalDBSpec = ticketsToExport <- run appExecution -- Check that we have tickets. - assert . null $ ticketsToExport + assert . not . null $ ticketsToExport assert $ length ticketsToExport == length listTickets where -- [a] -> Int -> Int -> (a -> m b) -> m [b]