From 3998f4b65337e26c2dcdbf1f08784fa3be2f0b86 Mon Sep 17 00:00:00 2001 From: mayad224 Date: Tue, 8 Nov 2016 09:43:06 -0500 Subject: [PATCH 01/10] Add .travis.yml file --- .travis.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..15f43f3 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,28 @@ +language: java +install: ant deps +jdk: + -oraclejdk8 + -oraclejdk7 + -openjdk6 +sudo: false +addons: + apt: + packages: + - oracle-java8-installer + ``` + +## Build Matrix + +For Java projects, `env` and `jdk` can be given as arrays +to construct a build matrix. + +## Switching JDKs Within One Job + +If your build needs to switch JDKs during a job, you can do so with `jdk_switcher use …`. + +```yaml +script: + - jdk_switcher use oraclejdk8 + - # do stuff with Java 8 + - jdk_switcher use oraclejdk7 + - # do stuff with Java 7 \ No newline at end of file From f631b59c75190abfac760f8cf89cfe81d4f0fb60 Mon Sep 17 00:00:00 2001 From: mayad224 Date: Tue, 8 Nov 2016 09:45:29 -0500 Subject: [PATCH 02/10] Update .travis.yml file --- .travis.yml | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15f43f3..38933cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,2 @@ language: java -install: ant deps -jdk: - -oraclejdk8 - -oraclejdk7 - -openjdk6 -sudo: false -addons: - apt: - packages: - - oracle-java8-installer - ``` - -## Build Matrix - -For Java projects, `env` and `jdk` can be given as arrays -to construct a build matrix. - -## Switching JDKs Within One Job - -If your build needs to switch JDKs during a job, you can do so with `jdk_switcher use …`. - -```yaml -script: - - jdk_switcher use oraclejdk8 - - # do stuff with Java 8 - - jdk_switcher use oraclejdk7 - - # do stuff with Java 7 \ No newline at end of file +build: ant From 23c2e127ed606bc30dec8591353099c7deb86fc6 Mon Sep 17 00:00:00 2001 From: mayad224 Date: Tue, 8 Nov 2016 10:13:16 -0500 Subject: [PATCH 03/10] Add newline to .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 38933cd..8e8602a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,2 @@ language: java -build: ant +build: ant From 6a46842cd5cf18000e9c2173945dae04f6fc6151 Mon Sep 17 00:00:00 2001 From: mayad224 Date: Tue, 8 Nov 2016 10:27:27 -0500 Subject: [PATCH 04/10] add --- .classpath | 6 ++++++ .gitignore | 1 + .project | 17 +++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 .classpath create mode 100644 .gitignore create mode 100644 .project diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..fb50116 --- /dev/null +++ b/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/.project b/.project new file mode 100644 index 0000000..8d1a8e8 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + TravisExercise + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + From 63bfd9324fb76b78c1a557ecca1819a70e3e39e1 Mon Sep 17 00:00:00 2001 From: mayad224 Date: Tue, 8 Nov 2016 10:32:54 -0500 Subject: [PATCH 05/10] break build --- 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 47773c2bbd920cf5e71bdec16432811c507467aa Mon Sep 17 00:00:00 2001 From: mayad224 Date: Thu, 10 Nov 2016 09:24:38 -0500 Subject: [PATCH 06/10] fix build --- src/Demo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]); From 4b31cd1a3e26965f0055233e953e19f5399e8e4b Mon Sep 17 00:00:00 2001 From: mayad224 Date: Thu, 10 Nov 2016 09:27:25 -0500 Subject: [PATCH 07/10] edit .travis.yml file to run ant --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8e8602a..7efe24b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,2 @@ language: java -build: ant +script: ant From e5fb16be920916e837f7f34ab05ca594756c29ac Mon Sep 17 00:00:00 2001 From: mayad224 Date: Thu, 10 Nov 2016 09:29:38 -0500 Subject: [PATCH 08/10] break build to see if travis finds it added semi colon --- src/Demo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Demo.java b/src/Demo.java index e9f2b4c..5994d5b 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 e95ddf8e3de1784d804552d1076101b6f0fd53b8 Mon Sep 17 00:00:00 2001 From: mayad224 Date: Thu, 10 Nov 2016 09:33:37 -0500 Subject: [PATCH 09/10] removing semi colons to make a fail --- src/Demo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Demo.java b/src/Demo.java index 5994d5b..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 ab43402a7c6410896b38a2449b640eb16f124602 Mon Sep 17 00:00:00 2001 From: mayad224 Date: Thu, 10 Nov 2016 09:35:52 -0500 Subject: [PATCH 10/10] fix build break --- src/Demo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]);