Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doc tweaks and auto publish gh-pages with master content #17

Merged
merged 39 commits into from
Jan 27, 2017

Conversation

raulraja
Copy link
Contributor

@raulraja raulraja commented Dec 27, 2016

@juanpedromoreno Can you please review? thanks.
Fixes #28

@@ -11,7 +11,7 @@ script:

after_success:
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt
compile publishSigned; fi
compile makeMicrosite publishMicrosite publishSigned; fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't work, since Travis hasn't configured credentials to push the microsite. Let me to commit some adjustments here.

BTW, publishMicrosite involves a makeMicrosite ;)

@codecov-io
Copy link

codecov-io commented Jan 16, 2017

Current coverage is 60.00% (diff: 100%)

Merging #17 into master will increase coverage by 0.15%

@@             master        #17   diff @@
==========================================
  Files            17         17          
  Lines           127        125     -2   
  Methods         127        125     -2   
  Messages          0          0          
  Branches          0          0          
==========================================
- Hits             76         75     -1   
+ Misses           51         50     -1   
  Partials          0          0          

Powered by Codecov. Last update fc9b68a...41137b1

Copy link
Contributor

@juanpedromoreno juanpedromoreno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is working for this PR, but it won't work in master. Could you please double check it? Thanks!

@@ -4,14 +4,14 @@ scala:
jdk:
- oraclejdk8
before_install:
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_86276aecec54_key -iv $encrypted_86276aecec54_iv
-in secring.gpg.enc -out secring.gpg -d; fi
- if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then bash
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check condition won't work once this PR is merged in master (the openssl command doesn't work for PR forks. Therefore,

if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ...

script:
- sbt ++$TRAVIS_SCALA_VERSION clean coverage test coverageReport

after_success:
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt
compile makeMicrosite publishMicrosite publishSigned; fi
- if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then bash
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then bash

??

@juanpedromoreno juanpedromoreno dismissed their stale review January 17, 2017 17:22

Sorry, I've just realized that I was reviewing a commit. Seeing the whole story looks good ;)

@raulraja
Copy link
Contributor Author

@juanpedromoreno Added a few more commits that made sense to merge with this branch. Can you take a look when you can? thanks!

Copy link
Contributor

@juanpedromoreno juanpedromoreno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great! 👍

@raulraja raulraja merged commit 6f80e93 into master Jan 27, 2017
@raulraja raulraja deleted the rr-doc-tweak-styles branch January 27, 2017 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants