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

Add abilitiy to configure different git hosting services. #124

Merged
merged 5 commits into from
Jan 30, 2017
Merged

Add abilitiy to configure different git hosting services. #124

merged 5 commits into from
Jan 30, 2017

Conversation

cranst0n
Copy link
Contributor

First run at #123. Note that I also upgraded FontAwesome to 4.7.0 only because it added a GitLab icon in 4.6.0.

@@ -54,5 +54,9 @@ trait MicrositeKeys {
val micrositePalette = settingKey[Map[String, String]]("Microsite palette")
val micrositeGithubOwner = settingKey[String]("Microsite Github owner")
val micrositeGithubRepo = settingKey[String]("Microsite Github repo")
val micrositeGitHostingService =
settingKey[String]("Service used for git hosting. By default, it'll be 'Github'.")
val micrositeGitHostingUrl = settingKey[String](
Copy link
Contributor

Choose a reason for hiding this comment

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

can we set this automatically to empty strings when the user specifies a different micrositeGitHostingService automatically so they don't have to do that themselves?

@cranst0n
Copy link
Contributor Author

@raulraja Updated with your recommendations. Also added some JS that will hide the github related watching/stars stats if it's not a GitHub project.

@cranst0n
Copy link
Contributor Author

Is Travis is failing because it's a chicken and egg situation or is it legit? This is my first dive into an SBT plugin. It passed locally after a publish-local.

@raulraja
Copy link
Contributor

Looks like the scripted tests are failing. They need to be adjusted to reflect the new settings. We also need to make sure this change does not break existing configurations for other sites. Is any of the new keys or settings mandatory or change the way the setup works? Also instead of having the stats and stuff from github.com hidden perhaps we should not make the call to github.com unless that is the provider applied to a given configuration. Potentially we could add a new setting key to not fetch github.com stats and contributions which would be useful regardless for people not wanting to show those.

@cranst0n
Copy link
Contributor Author

Right. I'm just not sure if the test I added is only failing because it's trying to fetch 0.4.1-SHAPSHOT and coming back with the last snapshot that was published (which would not include any of the setting keys I've added) or if there's something else I'm missing/understanding. After I did a publish-local on my local machine, all tests passed. It looks as though my test is the only one failing on Travis.

These new settings should be optional and have no effect if they're not used.

I will update to undo hiding the GitHub stat indicators.

@cranst0n
Copy link
Contributor Author

@raulraja Any guidance on how you want me to proceed with the test?

@raulraja
Copy link
Contributor

@juanpedromoreno is there anything special that needs to happen for the scripted test to work in this scenario?

@juanpedromoreno
Copy link
Member

@cranst0n @raulraja I've just merged this PR #126.

Could you try again rebasing from upstream master? Thanks!

Copy link
Member

@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.

Cool, it worked. This new feature looks good to me, great contribution!

@raulraja Seems like we need your blessing here before merging. Thanks!

@raulraja
Copy link
Contributor

@cranst0n thanks for your contribution!

@juanpedromoreno juanpedromoreno merged commit 4b8558d into 47degrees:master Jan 30, 2017
@cranst0n
Copy link
Contributor Author

@raulraja @juanpedromoreno Thanks for working to get this in. Happy to make a small contribution to a really great project!

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.

None yet

3 participants