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

Jump to bottom

Switch to more standard series/x.y naming convention #2543

Merged
merged 1 commit into from
May 2, 2019
Merged

Switch to more standard series/x.y naming convention #2543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stages:
branches:
only:
- master
- /^release-/
- /^series\//
if: type = push

env:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/hugo/layouts/partials/edit-button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ $apiVer := index .Site.Data.build.versions "http4s.api" }}
<a href="https://github.com/http4s/http4s/edit/release-{{ $apiVer }}.x/docs/src/main/tut/{{ replace .File.Path (print "v" $apiVer) ""}}" class="btn btn-secondary btn-sm">
<a href="https://github.com/http4s/http4s/edit/series/{{ $apiVer }}/docs/src/main/tut/{{ replace .File.Path (print "v" $apiVer) ""}}" class="btn btn-secondary btn-sm">
<i class="fa fa-edit"></i>
</a>
2 changes: 1 addition & 1 deletion docs/src/hugo/layouts/partials/edit-link.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{ $apiVer := index .Site.Data.build.versions "http4s.api" }}
<a href="https://github.com/http4s/http4s/edit/release-{{ $apiVer }}.x/docs/src/main/tut/{{ replace .File.Path (print "v" $apiVer) ""}}"><i class="fa fa-pencil"></i> Edit this page</a>
<a href="https://github.com/http4s/http4s/edit/series/{{ $apiVer }}/docs/src/main/tut/{{ replace .File.Path (print "v" $apiVer) ""}}"><i class="fa fa-pencil"></i> Edit this page</a>
2 changes: 1 addition & 1 deletion project/Http4sPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ object Http4sPlugin extends AutoPlugin {
sys.env.get("TRAVIS_JDK_VERSION").contains("oraclejdk8") &&
(sys.env.get("TRAVIS_BRANCH") match {
case Some("master") => true
case Some(branch) if branch.startsWith("release-") => true
case Some(branch) if branch.startsWith("series/") => true
case _ => false
})
},
Expand Down
2 changes: 1 addition & 1 deletion website/src/hugo/content/contributing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ markdown via GitHub.

### `docs` documentation

Each branch `master` and `release-X.Y`, publishes documentation per
Each branch `master` and `series/X.Y`, publishes documentation per
minor version into the `/vX.Y` directory of http4s.org. The Hugo site
chrome lives in the `docs/src/hugo` directory, and the [tut] content
lives in `docs/src/main/tut`. Tut is used to typecheck our
Expand Down