From 2099e958ea3d21a4ce66e9a4dbbe1dd93e81a9b9 Mon Sep 17 00:00:00 2001 From: Sivakumar Kailasam Date: Mon, 9 Sep 2019 08:22:29 +0530 Subject: [PATCH 01/11] Deploy from travis --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1673822d46..43b1b197a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: node_js node_js: - - "8" + - '8' sudo: false dist: trusty @@ -21,13 +21,16 @@ branches: env: global: - - secure: "uh/i3/82ECzpG2ozoEpRsvdMO9o2WG8KSR4csIIDNB9kIxsvacB1xfrOStj6HM1XCTwZgcGa6zLG0rjvdZqNTFZOGT75u7mVJ7hJsReGi6rCncSNmxdWC6KUZw5LxO4Sm+G10F+ysUcdBhiW8UdeLrNTNw75DOCC3U28HWtO84/DsIzZNRgZjzLzOMGEr3E28VJvEZx6znRJyDujb57y3QCER5AE83dQ+t+Wmn0L+vG78q5waO6qSFK2Aib3bpNw57duRwALwaErRAWfi3pBzFf/WjnRGoAXnXBjKI7GRoNOxSTq0MgzE0SZHfF4jb3uplxtAL9T0I1QSp4wkjBU21OzKcYI8sznQq9sUwPyyB98ASvLYpfZEkxBsC1IAvhHBFXIqP8CcLef8nfNdEuHW11KpDdjc0X+zSzH5bj2Ske0Ip2OHmARsLQawQELneNNelYoUmMMuJTy7HtPcX925S0Z2YWjIWja1xQjfWR8Be1ReUYVEYoYyCkttMe6Qa9hobdf+Yy3dwAwIpZUZX+ZPw68TzkQdjNWSC9Nn8Su1yGnyzgOwd4kBNmiluvjcYhKU82x0I025e3zEsHR3jVbuu/KrnVOtSfqFimPbtL1oUeR5e1Yg6fFF8sbnSXeR3lCXpQFXrv9OowvbWqD4lhCUwE3Jovx5QOVZwubL1EScyo=" + - secure: 'uh/i3/82ECzpG2ozoEpRsvdMO9o2WG8KSR4csIIDNB9kIxsvacB1xfrOStj6HM1XCTwZgcGa6zLG0rjvdZqNTFZOGT75u7mVJ7hJsReGi6rCncSNmxdWC6KUZw5LxO4Sm+G10F+ysUcdBhiW8UdeLrNTNw75DOCC3U28HWtO84/DsIzZNRgZjzLzOMGEr3E28VJvEZx6znRJyDujb57y3QCER5AE83dQ+t+Wmn0L+vG78q5waO6qSFK2Aib3bpNw57duRwALwaErRAWfi3pBzFf/WjnRGoAXnXBjKI7GRoNOxSTq0MgzE0SZHfF4jb3uplxtAL9T0I1QSp4wkjBU21OzKcYI8sznQq9sUwPyyB98ASvLYpfZEkxBsC1IAvhHBFXIqP8CcLef8nfNdEuHW11KpDdjc0X+zSzH5bj2Ske0Ip2OHmARsLQawQELneNNelYoUmMMuJTy7HtPcX925S0Z2YWjIWja1xQjfWR8Be1ReUYVEYoYyCkttMe6Qa9hobdf+Yy3dwAwIpZUZX+ZPw68TzkQdjNWSC9Nn8Su1yGnyzgOwd4kBNmiluvjcYhKU82x0I025e3zEsHR3jVbuu/KrnVOtSfqFimPbtL1oUeR5e1Yg6fFF8sbnSXeR3lCXpQFXrv9OowvbWqD4lhCUwE3Jovx5QOVZwubL1EScyo=' before_install: - npm config set spin false + - npm install -g netlify-cli script: - npm run lint:hbs - npm run lint:js - npm run lint:md - npm test + - npm run build --prod + - netlify deploy From d30df6939ddb6af00afe45427608d25c9df0adc7 Mon Sep 17 00:00:00 2001 From: Sivakumar Kailasam Date: Mon, 9 Sep 2019 14:48:17 +0530 Subject: [PATCH 02/11] introduce staged builds --- .travis.yml | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43b1b197a7..765fda8a2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ cache: branches: only: - master + - octane # npm version tags - /^v\d+\.\d+\.\d+/ @@ -27,10 +28,30 @@ before_install: - npm config set spin false - npm install -g netlify-cli -script: - - npm run lint:hbs - - npm run lint:js - - npm run lint:md - - npm test - - npm run build --prod - - netlify deploy +stages: + - lint + - tests + - deploy preview + - deploy prod + +jobs: + include: + - stage: lint + name: 'Lint templates' + script: npm run lint:hbs + - script: npm run lint:js + name: 'Lint javascript' + - script: npm run lint:md + name: 'Lint markdown' + - stage: tests + script: npm test + - stage: deploy prod + script: + - npm run build --prod + - netlify deploy --prod + if: branch = master + - stage: deploy preview + script: + - npm run build --prod + - netlify deploy + if: branch != master From 338cb9aeb1fce2ee2195fe61fa87e18d967e3386 Mon Sep 17 00:00:00 2001 From: Sivakumar Kailasam Date: Mon, 9 Sep 2019 14:51:59 +0530 Subject: [PATCH 03/11] Fix stage names --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 765fda8a2d..a99b3e4461 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,8 @@ before_install: stages: - lint - tests - - deploy preview - - deploy prod + - deploy preview app + - deploy to prod jobs: include: @@ -45,12 +45,12 @@ jobs: name: 'Lint markdown' - stage: tests script: npm test - - stage: deploy prod + - stage: deploy to prod script: - npm run build --prod - netlify deploy --prod - if: branch = master - - stage: deploy preview + if: type IN (push) AND branch = master + - stage: deploy preview app script: - npm run build --prod - netlify deploy From 799c48a182e581187ee1a37a782f793aedcf1aa2 Mon Sep 17 00:00:00 2001 From: Sivakumar Kailasam Date: Mon, 9 Sep 2019 14:55:20 +0530 Subject: [PATCH 04/11] Combine lint n tests stages --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a99b3e4461..caa318ea52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,22 +29,21 @@ before_install: - npm install -g netlify-cli stages: - - lint - - tests + - lint n test - deploy preview app - deploy to prod jobs: include: - - stage: lint + - stage: lint n test name: 'Lint templates' script: npm run lint:hbs - script: npm run lint:js name: 'Lint javascript' - script: npm run lint:md name: 'Lint markdown' - - stage: tests - script: npm test + - script: npm test + name: 'Ember test suite' - stage: deploy to prod script: - npm run build --prod From 7283e22fb4f9980dad098d538767b97ba6b1783b Mon Sep 17 00:00:00 2001 From: Sivakumar Kailasam Date: Mon, 9 Sep 2019 14:59:13 +0530 Subject: [PATCH 05/11] rearrange stages --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index caa318ea52..0942b7963f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,13 +44,13 @@ jobs: name: 'Lint markdown' - script: npm test name: 'Ember test suite' - - stage: deploy to prod - script: - - npm run build --prod - - netlify deploy --prod - if: type IN (push) AND branch = master - stage: deploy preview app script: - npm run build --prod - netlify deploy if: branch != master + - stage: deploy to prod + script: + - npm run build --prod + - netlify deploy --prod + if: type IN (push) AND branch = master From fd8f0c9ae04275458fe390db44c1e94ba7d6e3fc Mon Sep 17 00:00:00 2001 From: Sivakumar Kailasam Date: Mon, 9 Sep 2019 15:09:09 +0530 Subject: [PATCH 06/11] Activate deploy step for prs --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0942b7963f..11cb48a572 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ jobs: script: - npm run build --prod - netlify deploy - if: branch != master + if: type = pull_request - stage: deploy to prod script: - npm run build --prod From b51cc99e015e641128d64da5d68fc14541ec02bd Mon Sep 17 00:00:00 2001 From: Sivakumar Kailasam Date: Mon, 9 Sep 2019 16:09:02 +0530 Subject: [PATCH 07/11] Fix npm run script invocation --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11cb48a572..4025b20790 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,11 +46,11 @@ jobs: name: 'Ember test suite' - stage: deploy preview app script: - - npm run build --prod + - npm run build -- --prod - netlify deploy if: type = pull_request - stage: deploy to prod script: - - npm run build --prod + - npm run build -- --prod - netlify deploy --prod if: type IN (push) AND branch = master From dee920a5ec7119230df170c2acdc22f4c51faf15 Mon Sep 17 00:00:00 2001 From: Sivakumar Kailasam Date: Tue, 10 Sep 2019 09:28:04 +0530 Subject: [PATCH 08/11] Deploy preview apps ignorin test failures --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4025b20790..3be821df61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,6 @@ before_install: stages: - lint n test - - deploy preview app - deploy to prod jobs: @@ -44,8 +43,7 @@ jobs: name: 'Lint markdown' - script: npm test name: 'Ember test suite' - - stage: deploy preview app - script: + - script: - npm run build -- --prod - netlify deploy if: type = pull_request From a7d36b7f91156e5dbf0d2d0bf1f632cfc0e32fc9 Mon Sep 17 00:00:00 2001 From: Sivakumar Kailasam Date: Wed, 11 Sep 2019 21:42:34 +0530 Subject: [PATCH 09/11] Bump nodejs to latest on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3be821df61..d69222b18b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: node_js node_js: - - '8' + - '12' sudo: false dist: trusty From 5bae6271fa7311e48805320473c58471d0a622a4 Mon Sep 17 00:00:00 2001 From: Sivakumar Kailasam Date: Mon, 16 Sep 2019 21:13:30 +0530 Subject: [PATCH 10/11] Have travis wait for netlify deploy --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d69222b18b..82779b10d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,10 +45,10 @@ jobs: name: 'Ember test suite' - script: - npm run build -- --prod - - netlify deploy + - travis_wait netlify deploy if: type = pull_request - stage: deploy to prod script: - npm run build -- --prod - - netlify deploy --prod + - travis_wait netlify deploy --prod if: type IN (push) AND branch = master From 837491c1d23388159660b6e810137acb4dd6d3df Mon Sep 17 00:00:00 2001 From: Sivakumar Kailasam Date: Mon, 16 Sep 2019 21:47:46 +0530 Subject: [PATCH 11/11] Have travis wait for netlify deploy --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 82779b10d2..fb15868c43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,10 +45,10 @@ jobs: name: 'Ember test suite' - script: - npm run build -- --prod - - travis_wait netlify deploy + - travis_wait 40 netlify deploy if: type = pull_request - stage: deploy to prod script: - npm run build -- --prod - - travis_wait netlify deploy --prod + - travis_wait 40 netlify deploy --prod if: type IN (push) AND branch = master