From 02adc152c6c5bf26dced074c6169adad7d4e4c3c Mon Sep 17 00:00:00 2001 From: Kartoshka Date: Tue, 8 Nov 2016 09:25:00 -0500 Subject: [PATCH 1/7] Testing travis CI --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..87c395d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,2 @@ +language: java +install: ant deps From 48da7543aafd7d6771545fb787cb85021c3dcc6c Mon Sep 17 00:00:00 2001 From: Kartoshka Date: Tue, 8 Nov 2016 09:27:55 -0500 Subject: [PATCH 2/7] fix travis file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 87c395d..45a06fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,2 @@ language: java -install: ant deps +install: ant From a7b3444054b045906f5be00db04bcda5a76e6edc Mon Sep 17 00:00:00 2001 From: Kartoshka Date: Tue, 8 Nov 2016 09:34:45 -0500 Subject: [PATCH 3/7] more tests with travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 45a06fb..943e462 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,2 @@ language: java -install: ant +install: ant compile From d1f543d28ee9300daf4c65cad46b668adba41d51 Mon Sep 17 00:00:00 2001 From: Kartoshka Date: Tue, 8 Nov 2016 09:41:33 -0500 Subject: [PATCH 4/7] Hopefully fix travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 943e462..b4c51aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,2 @@ language: java -install: ant compile +build: ant compile From dbe892f2edb92fae7e32b430be2c8b21f0c27296 Mon Sep 17 00:00:00 2001 From: Kartoshka Date: Tue, 8 Nov 2016 09:47:11 -0500 Subject: [PATCH 5/7] Hopefully fix travis, script instead of build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b4c51aa..f593078 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,2 @@ language: java -build: ant compile +script: ant compile From 2e136ddb3c51b51102b2abbf417a6668307178a6 Mon Sep 17 00:00:00 2001 From: Kartoshka Date: Thu, 10 Nov 2016 09:24:01 -0500 Subject: [PATCH 6/7] Introduce bug --- src/Demo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Demo.java b/src/Demo.java index e9f2b4c..53b5b30 100644 --- a/src/Demo.java +++ b/src/Demo.java @@ -1,7 +1,7 @@ public class Demo { public static void main(String argv[]) { - Order order = new Order("Shane", 444.0f); + Order order = new Order("Shane");//, 444.0f); DiscountStrategy strategy = null; int selectedStrat = Integer.parseInt(argv[0]); From 89043e1414fae69ecc9c17ad6c0ae7c6271d064c Mon Sep 17 00:00:00 2001 From: Kartoshka Date: Thu, 10 Nov 2016 09:32:04 -0500 Subject: [PATCH 7/7] fix build error --- src/Demo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Demo.java b/src/Demo.java index 53b5b30..e9f2b4c 100644 --- a/src/Demo.java +++ b/src/Demo.java @@ -1,7 +1,7 @@ public class Demo { public static void main(String argv[]) { - Order order = new Order("Shane");//, 444.0f); + Order order = new Order("Shane", 444.0f); DiscountStrategy strategy = null; int selectedStrat = Integer.parseInt(argv[0]);