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

Fix the build in Travis #104

Merged
merged 6 commits into from
Aug 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ script:
- sbt ++$TRAVIS_SCALA_VERSION --warn update compile scripted make-site

sudo: false
dist: trusty

addons:
apt:
Expand All @@ -23,9 +24,9 @@ before_install:

install:
- gem install jekyll:2.5.3 nanoc:3.8.0 asciidoctor --no-rdoc --no-ri
- npm install -g gitbook-cli
- npm install -g gitbook-cli@2.3.0
- |
mkdir $TRAVIS_BUILD_DIR/download && mkdir $HOME/bin && \
mkdir $TRAVIS_BUILD_DIR/download && \
wget https://github.com/spf13/hugo/releases/download/v0.20.1/hugo_0.20.1_linux-64bit.tar.gz -O $TRAVIS_BUILD_DIR/download/hugo.tgz && \
tar xvf $TRAVIS_BUILD_DIR/download/hugo.tgz && \
mv $TRAVIS_BUILD_DIR/hugo_0.20.1_linux_amd64/hugo_0.20.1_linux_amd64 $HOME/bin/hugo && \
Expand Down
5 changes: 2 additions & 3 deletions src/sbt-test/gitbook/can-use-gitbook/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ name := "test"

val checkContent = taskKey[Unit]("checkContent")

val v2 = project.configure(gitbookProject("v2"))
val v2Output = project.configure(gitbookProject("v2-output"))
val v3Output = project.configure(gitbookProject("v3-output"))
val v3 = project.configure(gitbookProject("v3"))

val root = project.in(file("."))
.aggregate(v2, v2Output, v3)
.aggregate(v3Output, v3)

def gitbookProject(version: String)(project: Project): Project = project
.in(file(version))
Expand Down
12 changes: 0 additions & 12 deletions src/sbt-test/gitbook/can-use-gitbook/v2/src/gitbook/README.md

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions src/sbt-test/gitbook/can-use-gitbook/v2/src/gitbook/book.json

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"gitbook": "2.x.x",
"gitbook": "3.0.3",
"output": "target/site/docs"
}