From 4a060f120ac0dbb28c217604dddaeed0a99d2ab5 Mon Sep 17 00:00:00 2001 From: jobevers Date: Tue, 7 Feb 2017 23:56:25 -0600 Subject: [PATCH 1/8] add changelog and check --- .travis.yml | 1 + CHANGELOG.md | 8 ++++++++ Dangerfile | 6 ++++++ 3 files changed, 15 insertions(+) create mode 100644 CHANGELOG.md create mode 100644 Dangerfile diff --git a/.travis.yml b/.travis.yml index 6a9da8fbb..4189bdb8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ script: - mkdir upload - cd dist; zip -r ../upload/dist.zip *; cd - - .travis/echo_sha.sh > upload/data.json + - rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger deploy: provider: s3 diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..4a8750713 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/). + +(Note for Alex: fill in what kind of versioning we want to use) + +## [Unreleased] diff --git a/Dangerfile b/Dangerfile new file mode 100644 index 000000000..6b8580dee --- /dev/null +++ b/Dangerfile @@ -0,0 +1,6 @@ +# Add a CHANGELOG entry for app changes +has_app_changes = !(git.modified_files.grep(/js/).empty? || git.modified_files.grep(/scss/).empty?) +if !git.modified_files.include?("CHANGELOG.md") && has_app_changes + fail("Please include a CHANGELOG entry.") + message "See http://keepachangelog.com/en/0.3.0/ for details on good changelog guidelines" +end From 96ace874ce2abb5f7de357867ab5942445dc62b2 Mon Sep 17 00:00:00 2001 From: jobevers Date: Tue, 7 Feb 2017 23:59:27 -0600 Subject: [PATCH 2/8] see what rubies are available --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4189bdb8a..ef8f17d2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ script: - mkdir upload - cd dist; zip -r ../upload/dist.zip *; cd - - .travis/echo_sha.sh > upload/data.json + - rvm list rubies - rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger deploy: From 1c2eab4b40b87b99418aec0ff19fb75750ca79ee Mon Sep 17 00:00:00 2001 From: jobevers Date: Wed, 8 Feb 2017 00:02:58 -0600 Subject: [PATCH 3/8] install and use a more recent ruby --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef8f17d2f..600645919 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,7 @@ script: - mkdir upload - cd dist; zip -r ../upload/dist.zip *; cd - - .travis/echo_sha.sh > upload/data.json - - rvm list rubies - - rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger + - rvm install 2.3.1 && rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger deploy: provider: s3 From 5a86b68893234c9acc544ddabf5e30b6bd8e7bd2 Mon Sep 17 00:00:00 2001 From: jobevers Date: Wed, 8 Feb 2017 00:05:24 -0600 Subject: [PATCH 4/8] had boolean logic backwards --- Dangerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dangerfile b/Dangerfile index 6b8580dee..6cfa33ba7 100644 --- a/Dangerfile +++ b/Dangerfile @@ -1,5 +1,5 @@ # Add a CHANGELOG entry for app changes -has_app_changes = !(git.modified_files.grep(/js/).empty? || git.modified_files.grep(/scss/).empty?) +has_app_changes = !(git.modified_files.grep(/js/).empty? && git.modified_files.grep(/scss/).empty?) if !git.modified_files.include?("CHANGELOG.md") && has_app_changes fail("Please include a CHANGELOG entry.") message "See http://keepachangelog.com/en/0.3.0/ for details on good changelog guidelines" From 7ae5bf97bdbedfb97a3f3a60a1327e494f475ce8 Mon Sep 17 00:00:00 2001 From: jobevers Date: Wed, 8 Feb 2017 00:12:08 -0600 Subject: [PATCH 5/8] why is travis a pain --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 600645919..3a83e42da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: node_js node_js: 5 +rvm: 2.2 install: - npm install @@ -11,7 +12,7 @@ script: - mkdir upload - cd dist; zip -r ../upload/dist.zip *; cd - - .travis/echo_sha.sh > upload/data.json - - rvm install 2.3.1 && rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger + - gem install danger --version '~> 4.0' && danger deploy: provider: s3 From e01bd6c1e3ad593e737f5cb9030fa1f7b12c744e Mon Sep 17 00:00:00 2001 From: jobevers Date: Wed, 8 Feb 2017 00:22:42 -0600 Subject: [PATCH 6/8] combining languages on travis is too hard --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a83e42da..b23f4c7fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,17 @@ language: node_js node_js: 5 -rvm: 2.2 install: - npm install script: + - rvm install 2.3.1 && rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger - mkdir -p dist/css dist/js - node_modules/.bin/node-sass scss/all.scss dist/css/all.css - node_modules/.bin/webpack - mkdir upload - cd dist; zip -r ../upload/dist.zip *; cd - - .travis/echo_sha.sh > upload/data.json - - gem install danger --version '~> 4.0' && danger deploy: provider: s3 From cea2fc6e73c154d664c1875f868b2255681ee6b3 Mon Sep 17 00:00:00 2001 From: jobevers Date: Wed, 8 Feb 2017 00:28:44 -0600 Subject: [PATCH 7/8] build PRs and master/dev branches --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index b23f4c7fb..12826f732 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,13 @@ language: node_js node_js: 5 +# note that travis still builds PRs so that covers +# other branches +branches: + only: + - master + - development + install: - npm install From 820060eb444d535dcf1843ede1da3703b27def06 Mon Sep 17 00:00:00 2001 From: jobevers Date: Wed, 8 Feb 2017 00:31:21 -0600 Subject: [PATCH 8/8] try installing rvm earlier to get around https://github.com/travis-ci/travis-ci/issues/5092 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 12826f732..b1ad37013 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,11 @@ branches: - development install: + - rvm install 2.3.1 - npm install script: - - rvm install 2.3.1 && rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger + - rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger - mkdir -p dist/css dist/js - node_modules/.bin/node-sass scss/all.scss dist/css/all.css - node_modules/.bin/webpack