Commit 7c007acb authored by Lukas Riedel's avatar Lukas Riedel

Merge branch '75-documentation-page-down' into 'master'

Resolve "Documentation page down"

Closes #75

See merge request !71
parents b43c4be9 5fd718eb
......@@ -87,6 +87,7 @@ build:main:
- CMAKE_FLAGS="$CMAKE_FLAGS"
$DUNECONTROL --only=dorie all
- $DUNECONTROL --only=dorie make build_tests
- $DUNECONTROL --only=dorie make doc
artifacts:
name: "$CI_JOB_NAME"
paths:
......@@ -189,3 +190,26 @@ deploy:dockerhub-stable:
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE --build-arg PROCNUM=$CPUS_DIND
-t dorie/dorie:$CI_COMMIT_TAG .
- docker push dorie/dorie:$CI_COMMIT_TAG
deploy:sphinx-docs:
stage: deploy
only:
- tags@dorie/dorie
dependencies:
- build:main
before_script:
# install the netfly CLI
- apt-get install -y golang-go golang-glide
- go get -d github.com/netlify/netlifyctl
- cd $HOME/go/src/github.com/netlify/netlifyctl/
- make deps build
- go install
- cd $HOME/go/bin
script:
- ./netlifyctl deploy
-A $NETFLY_DEPLOY_TOKEN
-s $NETFLY_SITE_ID
-P $CI_PROJECT_DIR/build-cmake/doc/html
environment:
name: sphinx-docs
url: https://dorie-doc.netlify.com/
\ No newline at end of file
......@@ -34,6 +34,8 @@
captured and can be viewed and downloaded from the GitLab web interface.
* Fix a bug in the boundary condition evaluation where an `end()` iterator
was dereferenced without error.
* Re-introduced deployment of the documentation which can now be found online
at https://dorie-doc.netlify.com/.
## 1.1.0 (2018-07-27)
......
......@@ -167,7 +167,7 @@ The following software packages are cross-platform, so you should be able to fin
## Documentation
The documentation of the current `master` branch can be found [online](http://dorie-doc.bitballoon.com/).
The documentation of the latest release branch can be found [online](https://dorie-doc.netlify.com/).
The documentation can be built after DORiE has been properly configured (i.e., by calling `dunecontrol`). Note that you might have to re-configure DORiE once after installing it, because some dependencies are installed at configure time (e.g. by `dunecontrol --only=dorie configure`). To build the documentation, just run
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment