From 2b138927fd6a3230fe06fd44b330b6a602cc5d58 Mon Sep 17 00:00:00 2001 From: Kevin Nam Date: Thu, 12 Nov 2015 09:21:53 -0500 Subject: [PATCH 1/6] Added .travis.yml --- .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..a98b760 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,2 @@ +language: java + From 75e7b8ae0817c62d7bcde8ba78e924da1a2920e6 Mon Sep 17 00:00:00 2001 From: Kevin Nam Date: Thu, 12 Nov 2015 09:26:18 -0500 Subject: [PATCH 2/6] fixed travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a98b760..dff5f3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1 @@ language: java - From e36e90d2c3d3038089f78a87a4ae5862b5043193 Mon Sep 17 00:00:00 2001 From: Kevin Nam Date: Thu, 12 Nov 2015 09:31:48 -0500 Subject: [PATCH 3/6] fixed travis #2 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index dff5f3a..c104015 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,3 @@ language: java +install: ant init +install: ant compile From 45d79d061a61bea3b738b74dd7c59b44f332a38e Mon Sep 17 00:00:00 2001 From: Kevin Nam Date: Thu, 12 Nov 2015 09:33:51 -0500 Subject: [PATCH 4/6] fixed travis #3 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c104015..c6df209 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: java -install: ant init -install: ant compile +script: ant init +script: ant compile From b5e6ef12d543a64de0a35cb0466fcb62f4e8beed Mon Sep 17 00:00:00 2001 From: Kevin Nam Date: Thu, 12 Nov 2015 09:37:52 -0500 Subject: [PATCH 5/6] error testing for travis --- src/Demo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Demo.java b/src/Demo.java index e9f2b4c..d7189d2 100644 --- a/src/Demo.java +++ b/src/Demo.java @@ -2,7 +2,7 @@ public class Demo { public static void main(String argv[]) { Order order = new Order("Shane", 444.0f); - DiscountStrategy strategy = null; + DiscountStrategy strategy = null int selectedStrat = Integer.parseInt(argv[0]); float amt = Float.parseFloat(argv[1]); From e07466f926cacef5aa152dac3cd1d052e9f644a1 Mon Sep 17 00:00:00 2001 From: Kevin Nam Date: Thu, 12 Nov 2015 09:44:05 -0500 Subject: [PATCH 6/6] Fixed build break, and removed redundency in travis --- .travis.yml | 1 - src/Demo.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c6df209..f593078 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,2 @@ language: java -script: ant init script: ant compile diff --git a/src/Demo.java b/src/Demo.java index d7189d2..e9f2b4c 100644 --- a/src/Demo.java +++ b/src/Demo.java @@ -2,7 +2,7 @@ public class Demo { public static void main(String argv[]) { Order order = new Order("Shane", 444.0f); - DiscountStrategy strategy = null + DiscountStrategy strategy = null; int selectedStrat = Integer.parseInt(argv[0]); float amt = Float.parseFloat(argv[1]);