diff --git a/SETUP.md b/SETUP.md index 6966c8f..abe84f7 100644 --- a/SETUP.md +++ b/SETUP.md @@ -73,6 +73,7 @@ echo https://github.com/$OWNER/$REPO/settings/keys ``` Manually add `deploy.key.pub` (with write access) to GitHub under the repository's deploy key settings (the URL echoed above). +Give the key a descriptive title, such as "Travis CI Manubot". For the next step, you need the [Travis command line client](https://github.com/travis-ci/travis.rb) installed. This program is a Ruby gem: @@ -103,6 +104,14 @@ TRAVIS_ENCRYPT_ID=`grep \ sed --in-place "s/f2f00aaf6402/$TRAVIS_ENCRYPT_ID/g" deploy.sh ``` +Next, limit [concurrent](https://blog.travis-ci.com/2014-07-18-per-repository-concurrency-setting/) Travis CI jobs to ensure previous builds deploy before subsequent ones begin: + +```sh +travis settings \ + --repo=$OWNER/$REPO \ + maximum_number_of_builds --set 1 +``` + The continuous integration configuration is now complete. Clean up: @@ -123,11 +132,14 @@ Now update `README.md` files to reference the new repository: # Perform substitutions sed --in-place "s/greenelab/$OWNER/g" README.md sed --in-place "s/manubot-rootstock/$REPO/g" README.md + +# Remove deletable content file +git rm content/02.delete-me.md ``` ## Finalize -Run `git status` or `git diff` to check that the following files have unstaged changes: +Run `git status` or `git diff --word-diff` to check that the following files have unstaged changes: + `README.md` + `ci/deploy.key.enc` diff --git a/build/assets/style.csl b/build/assets/style.csl index 466e765..a7dd0d8 100644 --- a/build/assets/style.csl +++ b/build/assets/style.csl @@ -1,142 +1,37 @@ - - diff --git a/build/build.sh b/build/build.sh index f3e1729..3b24e16 100644 --- a/build/build.sh +++ b/build/build.sh @@ -14,7 +14,7 @@ manubot \ --log-level=INFO # pandoc settings -CSL_PATH=https://github.com/dhimmel/manubot-rootstock/raw/5f01555cd81f67591de271bfb564487c65ca3313/build/assets/style.csl +CSL_PATH=build/assets/style.csl DOCX_PATH=build/assets/pandoc-reference.docx BIBLIOGRAPHY_PATH=output/references.json INPUT_PATH=output/manuscript.md diff --git a/build/environment.yml b/build/environment.yml index c27f069..4272d31 100644 --- a/build/environment.yml +++ b/build/environment.yml @@ -14,7 +14,7 @@ dependencies: - pip: - errorhandler==2.0.1 - ghp-import==0.5.5 - - git+https://github.com/dhimmel/manubot@03020da42f72fdaa05fceae2995a47a49a7823fb + - git+https://github.com/greenelab/manubot@367f0b5c8046e5ce2f1e5a0ef555ec29a4aefd59 - opentimestamps-client==0.5.0 - opentimestamps==0.1.0 - pandoc-eqnos==0.16 diff --git a/content/99.back-matter.md b/content/99.back-matter.md index ea7243e..339b33c 100644 --- a/content/99.back-matter.md +++ b/content/99.back-matter.md @@ -1 +1,4 @@ ## References {.page_break_before} + + +
diff --git a/webpage/github-pandoc.css b/webpage/github-pandoc.css index b954b1f..9786ec3 100644 --- a/webpage/github-pandoc.css +++ b/webpage/github-pandoc.css @@ -1,3 +1,5 @@ +/* From https://gist.github.com/dashed/6714393 with Manubot modifications */ + /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ /* ========================================================================== @@ -453,14 +455,14 @@ table { } .go-top { -position: fixed; -bottom: 2em; -right: 2em; -text-decoration: none; -background-color: #E0E0E0; -font-size: 12px; -padding: 1em; -display: inline; + position: fixed; + bottom: 2em; + right: 2em; + text-decoration: none; + background-color: #E0E0E0; + font-size: 12px; + padding: 1em; + display: inline; } /* Github css */