From b6fec26e77915343f99ae7f4c1dfbfd685d90a4f Mon Sep 17 00:00:00 2001 From: a-murphy Date: Sat, 6 Sep 2014 13:15:57 -0700 Subject: [PATCH 01/26] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 34e81b8e..7af9e813 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,4 +1,4 @@ -language: python +language: java python: - 2.6 From f664c055503ebe9f63dc6af3bcb655431a7feb54 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Thu, 11 Sep 2014 12:36:47 -0700 Subject: [PATCH 02/26] Update shippable.yml --- shippable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 7af9e813..d571cf2f 100755 --- a/shippable.yml +++ b/shippable.yml @@ -21,6 +21,6 @@ script: - which python && coverage run --branch test.py - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py -notifications: - email: - - exampleone@org.com +branches: + only: + - master From 20cdd5fd2210bcd4b336846c4f6c3b0a11610ce6 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Thu, 11 Sep 2014 12:52:02 -0700 Subject: [PATCH 03/26] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index d571cf2f..c4ee7039 100755 --- a/shippable.yml +++ b/shippable.yml @@ -22,5 +22,5 @@ script: - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py branches: - only: - - master + except: + - test From 365613053803c29a487c8d8ee59e9840cea20cfa Mon Sep 17 00:00:00 2001 From: a-murphy Date: Thu, 11 Sep 2014 15:28:09 -0700 Subject: [PATCH 04/26] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index c4ee7039..aa037362 100755 --- a/shippable.yml +++ b/shippable.yml @@ -24,3 +24,4 @@ script: branches: except: - test + From 6e60f3dd459ed7c43cf8768fbe2013371e570ab0 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Thu, 11 Sep 2014 15:29:02 -0700 Subject: [PATCH 05/26] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index aa037362..17bfddf2 100755 --- a/shippable.yml +++ b/shippable.yml @@ -22,6 +22,6 @@ script: - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py branches: - except: - - test + only: + - master From 355cae33401142c9dfaaaa45f2dbd987dd3ed514 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Thu, 11 Sep 2014 16:57:31 -0700 Subject: [PATCH 06/26] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 17bfddf2..03e30fb2 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,3 +25,4 @@ branches: only: - master + From b8886389bd04efb989a8b3a7e44769b5acc60632 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Thu, 11 Sep 2014 16:57:51 -0700 Subject: [PATCH 07/26] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 03e30fb2..a0cfef27 100755 --- a/shippable.yml +++ b/shippable.yml @@ -22,7 +22,7 @@ script: - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py branches: - only: + except: - master From 38babe3306da69c0ea716e13afc4ead40b160b5f Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 15 Sep 2014 14:06:07 -0700 Subject: [PATCH 08/26] Update shippable.yml --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index a0cfef27..d918007c 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,4 +25,3 @@ branches: except: - master - From e2f5da7fc1fc02534b68fe3463af913434e5555b Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 15 Sep 2014 14:06:37 -0700 Subject: [PATCH 09/26] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index d918007c..17bfddf2 100755 --- a/shippable.yml +++ b/shippable.yml @@ -22,6 +22,6 @@ script: - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py branches: - except: + only: - master From 8ff1fc55a22ee5cd7807850da86ee504abad2687 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 15 Sep 2014 14:07:05 -0700 Subject: [PATCH 10/26] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 17bfddf2..5dd2cff2 100755 --- a/shippable.yml +++ b/shippable.yml @@ -23,5 +23,5 @@ script: branches: only: - - master + - test From 5b5715f54a65a3364d86e7fd80ca0f28f7050c92 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Mon, 15 Sep 2014 16:24:48 -0700 Subject: [PATCH 11/26] [ci skip] --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 5dd2cff2..60a5c8f7 100755 --- a/shippable.yml +++ b/shippable.yml @@ -24,4 +24,3 @@ script: branches: only: - test - From fc54de87be97953524f085eeab5af76c95bb1c99 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 11:14:53 -0700 Subject: [PATCH 12/26] Update shippable.yml --- shippable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shippable.yml b/shippable.yml index 60a5c8f7..108913f7 100755 --- a/shippable.yml +++ b/shippable.yml @@ -24,3 +24,5 @@ script: branches: only: - test + +build_image_provider: none From 2e70338c22c7b8e50f1c2827712b23901411e68a Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 11:18:37 -0700 Subject: [PATCH 13/26] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 108913f7..a6252b94 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,4 +25,4 @@ branches: only: - test -build_image_provider: none +build_image: none From b84d4a87f43f98a0623818438b8b408ebae246b7 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 11:19:38 -0700 Subject: [PATCH 14/26] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index a6252b94..2d3eedbe 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,4 +25,4 @@ branches: only: - test -build_image: none +build_image: customimage From b7e098d30b8dc8a32c45b782e405160d22400ce5 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 11:23:51 -0700 Subject: [PATCH 15/26] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 2d3eedbe..d8ae2de5 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,4 +25,5 @@ branches: only: - test -build_image: customimage +build_image: + not_name: customimage From 0a0c41150acc6fc0d7064bd37d411a43a8f3e38e Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 11:25:56 -0700 Subject: [PATCH 16/26] Update shippable.yml --- shippable.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index d8ae2de5..2d3eedbe 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,5 +25,4 @@ branches: only: - test -build_image: - not_name: customimage +build_image: customimage From bb32f553c6282bdf29e25992b74b2f018284c1d3 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 11:30:46 -0700 Subject: [PATCH 17/26] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 2d3eedbe..63f3423a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,4 +25,4 @@ branches: only: - test -build_image: customimage +build_image: shippable/minv3 From 5287a24cd138c641f81fe35d7281394309de1660 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 11:33:14 -0700 Subject: [PATCH 18/26] Update shippable.yml --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 63f3423a..cce740ab 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,4 +25,3 @@ branches: only: - test -build_image: shippable/minv3 From 75a145db981a1f8aa662c9a8be83802b3702b68d Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 11:37:26 -0700 Subject: [PATCH 19/26] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index cce740ab..a2fc2bf6 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,3 +25,4 @@ branches: only: - test +build_timeout: 60 From f105145f2fe5cf30ddb69e7ea35ec101b3130804 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 11:46:29 -0700 Subject: [PATCH 20/26] Update shippable.yml --- shippable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index a2fc2bf6..85cb3a31 100755 --- a/shippable.yml +++ b/shippable.yml @@ -25,4 +25,5 @@ branches: only: - test -build_timeout: 60 +env: + - secure: 1LQLaemjTmrENVShukvN6RDGyF/fCBltlDbZmiFKnGFnmAI064GUyvfvK8HXDxEaewIAF4cgYhvpmHB/azfKKrMu05wtnhDU1dIZxVlyTg7waBQk2LhRAb9/eOvMKkeDoOvbDedwRRah9SF6/IStEz9gEXFQFFMvs9poGCx7PRhBdn7QLAeH5RHmHDfjJWKfUeuE4rs/b0CY0cwPxVzc1VH3xmCT31evb66ClGJ4dY0zFK6aYUYCe/lXG7dTjFDYN3kpBSehWOBzKaMbfg2wBCiunNm6jTmvcQdbqL6mgIEDPHre97sHSyAGF+81Al9LU2I1ek+HRPghFLlKBbeAsg== From ee28f5d70a53fdd319991811c23c058257c85e3c Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 11:51:42 -0700 Subject: [PATCH 21/26] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 85cb3a31..95fb28df 100755 --- a/shippable.yml +++ b/shippable.yml @@ -26,4 +26,4 @@ branches: - test env: - - secure: 1LQLaemjTmrENVShukvN6RDGyF/fCBltlDbZmiFKnGFnmAI064GUyvfvK8HXDxEaewIAF4cgYhvpmHB/azfKKrMu05wtnhDU1dIZxVlyTg7waBQk2LhRAb9/eOvMKkeDoOvbDedwRRah9SF6/IStEz9gEXFQFFMvs9poGCx7PRhBdn7QLAeH5RHmHDfjJWKfUeuE4rs/b0CY0cwPxVzc1VH3xmCT31evb66ClGJ4dY0zFK6aYUYCe/lXG7dTjFDYN3kpBSehWOBzKaMbfg2wBCiunNm6jTmvcQdbqL6mgIEDPHre97sHSyAGF+81Al9LU2I1ek+HRPghFLlKBbeAsg== + - secure: 10 From 4ec1e1d51978b4bef661e7b564b2d1ab8f0ab14b Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 11:56:08 -0700 Subject: [PATCH 22/26] Update shippable.yml --- shippable.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index 95fb28df..e6d6a88a 100755 --- a/shippable.yml +++ b/shippable.yml @@ -21,9 +21,9 @@ script: - which python && coverage run --branch test.py - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py -branches: - only: - - test +matrix: + include: + - test-reset env: - - secure: 10 + - secure: 1DGyF/fCBltlDbZmiFKnGFnmAI064GUyvfvK8HXDxEaewIAF4cgYhvpmHB/azfKKrMu05wtnhDU1dIZxVlyTg7waBQk2LhRAb9/eOvMKkeDoOvbDedwRRah9SF6/IStEz9gEXFQFFMvs9poGCx7PRhBdn7QLAeH5RHmHDfjJWKfUeuE4rs/b0CY0cwPxVzc1VH3xmCT31evb66ClGJ4dY0zFK6aYUYCe/lXG7dTjFDYN3kpBSehWOBzKaMbfg2wBCiunNm6jTmvcQdbqL6mgIEDPHre97sHSyAGF+81Al9LU2I1ek+HRPghFLlKBbeAsg== From 286d01c48027aee25a0e14928b122ce0150db223 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Fri, 10 Oct 2014 12:56:40 -0700 Subject: [PATCH 23/26] Update shippable.yml --- shippable.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index e6d6a88a..49e87bf6 100755 --- a/shippable.yml +++ b/shippable.yml @@ -21,9 +21,5 @@ script: - which python && coverage run --branch test.py - which python && coverage xml -o shippable/codecoverage/coverage.xml test.py -matrix: - include: - - test-reset - env: - secure: 1DGyF/fCBltlDbZmiFKnGFnmAI064GUyvfvK8HXDxEaewIAF4cgYhvpmHB/azfKKrMu05wtnhDU1dIZxVlyTg7waBQk2LhRAb9/eOvMKkeDoOvbDedwRRah9SF6/IStEz9gEXFQFFMvs9poGCx7PRhBdn7QLAeH5RHmHDfjJWKfUeuE4rs/b0CY0cwPxVzc1VH3xmCT31evb66ClGJ4dY0zFK6aYUYCe/lXG7dTjFDYN3kpBSehWOBzKaMbfg2wBCiunNm6jTmvcQdbqL6mgIEDPHre97sHSyAGF+81Al9LU2I1ek+HRPghFLlKBbeAsg== From 6dccb41522a533d2951185ccbe20bc9fde57f7a4 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Thu, 16 Oct 2014 15:12:52 -0700 Subject: [PATCH 24/26] [skip ci] --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 49e87bf6..633b3a0e 100755 --- a/shippable.yml +++ b/shippable.yml @@ -1,4 +1,4 @@ -language: java +language: python python: - 2.6 From 60fb7175a0bbd4b331a9dc5f0fcbe29ec3bd2ab2 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Thu, 16 Oct 2014 15:47:57 -0700 Subject: [PATCH 25/26] [shippable new build status flow] --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 633b3a0e..c44be870 100755 --- a/shippable.yml +++ b/shippable.yml @@ -5,7 +5,6 @@ python: - 2.7 - 3.2 - 3.3 - - 3.4 - pypy install: From 4d16254e113f6aeca6a33545f0006f5de3ee7393 Mon Sep 17 00:00:00 2001 From: a-murphy Date: Tue, 21 Oct 2014 13:07:44 -0700 Subject: [PATCH 26/26] [shippable new build status flow] --- shippable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index c44be870..7a0ca5d0 100755 --- a/shippable.yml +++ b/shippable.yml @@ -5,7 +5,6 @@ python: - 2.7 - 3.2 - 3.3 - - pypy install: - pip install -r requirements.txt