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.

Sign up for GitHub

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

gitSiteURL supports MicrositeKeys.GitHub and gitHostingUrl #272

Merged
merged 2 commits into from
Jul 15, 2018
Merged

gitSiteURL supports MicrositeKeys.GitHub and gitHostingUrl #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b6181c
gitSiteURL supports MicrositeKeys.GitHub and gitHostingUrl
britneywright Jul 13, 2018
d8ce68e
update docs for micrositeGitHostingUrl
britneywright Jul 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/src/main/tut/docs/settings.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ micrositeGithubToken := getEnvVar("GITHUB_TOKEN")
micrositePushSiteWith := GitHub4s
```

- `micrositeGitHostingService` and `micrositeGitHostingUrl`: in order to specify a hosting service other than `GitHub`:
- `micrositeGitHostingService` and `micrositeGitHostingUrl`: in order to specify a hosting service other than `GitHub`. If you are using a privately hosted GitHub instance you can set the `micrositeGitHostingUrl` to override the default github.com and repo name configuration.

```
micrositeGitHostingService := GitLab
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/microsites/microsites.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ case class MicrositeSettings(
micrositeKazariSettings: KazariSettings) {

def gitSiteUrl: String = {
gitSettings.gitHostingService match {
case MicrositeKeys.GitHub =>
(gitSettings.gitHostingService, gitSettings.gitHostingUrl) match {
case (MicrositeKeys.GitHub, "") =>
s"https://github.com/${gitSettings.githubOwner}/${gitSettings.githubRepo}"
case _ => gitSettings.gitHostingUrl
}
Expand Down